- Fix using mail() on Windows (#1485779)

2 files changed, 9 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f5728f4cb..91a9b6e1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix using mail() on Windows (#1485779)
 - Fix word wrapping in message-part's <PRE>s for printing (#1485787)
 - Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
 - Fix double footer in HTML message with embedded images
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index a76532cb9..f9d560a97 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1308,7 +1308,14 @@ function rcmail_deliver_message(&$message, $from, $mailto)
     // reset stored headers and overwrite
     $message->_headers = array();
     $header_str = $message->txtHeaders($headers_php);
-  
+    
+    // #1485779
+    if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+      if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
+        $headers_enc['To'] = implode(', ', $m[1]);
+        }
+      }
+       
     if (ini_get('safe_mode'))
       $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
     else