Don't create multipart/alternative messages with empty text/plain part (#5283)

Conflicts:
	CHANGELOG
	program/steps/mail/sendmail.inc

CHANGELOG

@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where contact search menu fields where always unchecked in Larry skin
 - Fix XSS issue in href attribute on area tag (#5240)
 - Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
+- Don't create multipart/alternative messages with empty text/plain part (#5283)
 
 RELEASE 1.1.5
 -------------

program/steps/mail/sendmail.inc

@@ -363,18 +363,19 @@ if ($isHtml) {
     $plainTextPart = rcube_mime::wordwrap($plainTextPart, $LINE_LENGTH, "\r\n", false, $message_charset);
     $plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
 
-    // completely blank text part confuses some mail clients
-    if ($plainTextPart == '') {
-        $plainTextPart = "\r\n";
-    }
-
-    // make sure all line endings are CRLF (#1486712)
-    $plainTextPart = preg_replace('/\r?\n/', "\r\n", $plainTextPart);
+    // There's no sense to use multipart/alternative if the text/plain
+    // part would be blank. Completely blank text/plain part may confuse
+    // some mail clients (#5283)
+    if (strlen(trim($plainTextPart)) > 0) {
+        // make sure all line endings are CRLF (#1486712)
+        $plainTextPart = preg_replace('/\r?\n/', "\r\n", $plainTextPart);
 
-    $plugin = $RCMAIL->plugins->exec_hook('message_outgoing_body',
-        array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME));
+        $plugin = $RCMAIL->plugins->exec_hook('message_outgoing_body',
+            array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME));
 
-    $MAIL_MIME->setTXTBody($plugin['body']);
+        // add a plain text version of the e-mail as an alternative part.
+        $MAIL_MIME->setTXTBody($plugin['body']);
+    }
 
     // look for "emoticon" images from TinyMCE and change their src paths to
     // be file paths on the server instead of URL paths.