diff --git a/CHANGELOG b/CHANGELOG
index 5bfe9b3aa..beced8e64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix bug where leading blanks were stripped from quoted lines (#1488795)
- Upgraded to jQuery 1.8.2 and jQuery UI 1.9.1
- Add config option to automatically generate LDAP attributes for new entries
- Better client-side timezone detection using the jsTimezoneDetect library (#1488725)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index d1dce9d0e..c1ebdca61 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -454,7 +454,7 @@ class rcube_install
'0.5-beta', '0.5', '0.5.1',
'0.6-beta', '0.6',
'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
- '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2',
+ '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3',
));
return $select;
}
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
index 2c4fd2cc8..889efd17d 100644
--- a/plugins/help/package.xml
+++ b/plugins/help/package.xml
@@ -13,9 +13,9 @@
alec@alec.pl
yes
- 2012-01-18
+ 2012-11-11
- 1.2
+ 1.3
1.2
@@ -30,27 +30,52 @@
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index 20caa7a87..931ae1b61 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -38,3 +38,8 @@
.toolbar a.button.license {
background: url(help.png) center -130px no-repeat;
}
+
+.iframebox.help_about,
+.iframebox.help_license {
+ overflow: auto;
+}
diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html
index 9790c1570..63cf0c21c 100644
--- a/plugins/help/skins/larry/templates/help.html
+++ b/plugins/help/skins/larry/templates/help.html
@@ -3,7 +3,6 @@
-
@@ -18,8 +17,11 @@
-
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index c0d36daf4..e4c4d8121 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -801,8 +801,8 @@ function rcmail_plain_body($body, $flowed=false)
// find/mark quoted lines...
for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
- if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) {
- $q = strlen(preg_replace('/\s/', '', $regs[0]));
+ if ($body[$n][0] == '>' && preg_match('/^(>+ {0,1})+/', $body[$n], $regs)) {
+ $q = substr_count($regs[0], '>');
$body[$n] = substr($body[$n], strlen($regs[0]));
if ($q > $quote_level) {