Fix handling of some improper constructs in format=flowed text as per the RFC3676[4.5] (#1490284)

Conflicts:
	CHANGELOG

CHANGELOG

@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail
 
 - Make SMTP error log more verbose - include server response and error code
 - Fix security issue in DBMail driver of password plugin (#1490261)
+- Fix handling of some improper constructs in format=flowed text as per the RFC3676[4.5] (#1490284)
 
 RELEASE 1.0.5
 -------------

program/lib/Roundcube/rcube_mime.php

@@ -523,7 +523,7 @@ class rcube_mime
                     // remove space-stuffing
                     $line = preg_replace('/^\s/', '', $line);
 
-                    if (isset($text[$last]) && $line
+                    if (isset($text[$last]) && $line && !$q_level
                         && $text[$last] != '-- '
                         && $text[$last][strlen($text[$last])-1] == ' '
                     ) {

tests/Framework/Mime.php

@@ -155,6 +155,21 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
         $this->assertEquals($unfolded, rcube_mime::unfold_flowed($flowed), "Test correct unfolding of quoted lines");
     }
 
+    /**
+     * Test format=flowed unfolding (#1490284)
+     */
+    function test_unfold_flowed2()
+    {
+        $flowed   = "> culpa qui officia deserunt mollit anim id est laborum.\r\n"
+                    ."> \r\n"
+                    ."Sed ut perspiciatis unde omnis iste natus error \r\nsit voluptatem";
+        $unfolded = "> culpa qui officia deserunt mollit anim id est laborum.\r\n"
+                    ."> \r\n"
+                    ."Sed ut perspiciatis unde omnis iste natus error sit voluptatem";
+
+        $this->assertEquals($unfolded, rcube_mime::unfold_flowed($flowed), "Test correct unfolding of quoted lines [2]");
+    }
+
     /**
      * Test wordwrap()
      */