Ticket #1484560: bugfix1484560.patch

trunk/roundcubemail/program/steps/mail/func.inc

@@ -680 +680 @@
     $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return ".JS_OBJECT_NAME.".command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";
     
     if ($part->ctype_parameters['format'] != 'flowed')
-      $body = wordwrap(trim($body), 80);
+    {
+      // Rebuild the message body with a maximum of 80 chars, while keeping
+      // quoted message.
+      $lines = preg_split('/\r?\n/', trim($body));
+      $body = '';
+      
+      foreach ($lines as $line)
+      {
+        if (strlen($line) > 80)
+        {
+          if (preg_match('/^(>+\s*)+/', $line, $regs))
+          {
+            $length = strlen($regs[0]);
+            $prefix = substr($line, 0, $length);
+            
+            // Remove '> ' from the line, then wordwrap() the line
+            $line = substr($line, $length);
+            $line = wordwrap($line, 80 - $length);
+            
+            // Rebuild the line with '> ' at the beginning of each 'subline'
+            $newline = '';
+            $line = explode("\n", $line);
+            
+            foreach ($line as $l)
+            {
+              $newline .= $prefix.$l."\n";
+            }
+            
+            // Remove the righest newline char
+            $line = rtrim($newline);
+          }
+          else
+          {
+            $line = wordwrap($line, 80);
+          }
+        }
+        
+        // Append the line
+        $body .= $line."\n";
+      }
+    }
 
     $body = preg_replace($convert_patterns, $convert_replaces, $body);