Fix another text wrapping issue

1 files changed, 2 insertions, 2 deletions

diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 1e4fac84a..96296a57c 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -622,7 +622,7 @@ class rcube_mime
                 $subString = $substr_func($string, 0, $width, $charset);
 
                 // last line
-                if ($subString === $string) {
+                if ($breakPos === false && $subString === $string) {
                     $cutLength = null;
                 }
                 else {
@@ -652,7 +652,7 @@ class rcube_mime
                         else if ($cut === false) {
                             $spacePos = $strpos_func($string, ' ', 0, $charset);
 
-                            if ($spacePos !== false) {
+                            if ($spacePos !== false && $spacePos < $breakPos) {
                                 $subString = $substr_func($string, 0, $spacePos, $charset);
                                 $cutLength = $spacePos + 1;
                             }