X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=2e45408826e51ca3e0d1e05d3565da258c4c655a;hb=7fc4b14fdb798a7b1c1d003163afa5865cce01f4;hp=a4706cf9a456170028459105c014fecab2a01911;hpb=5c4ff7bfc6e04337bd6bcf76743b1fbb92556233;p=squirrelmail.git

diff --git a/src/read_body.php b/src/read_body.php
index a4706cf9..2e454088 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -263,9 +263,12 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
-        $msg  = $deliver->dlv_msg . '<br />' .
+        $msg = $deliver->dlv_msg;
+        if (! empty($deliver->dlv_server_msg)) {
+            $msg.= '<br />' .
                 _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
-                $deliver->dlv_server_msg;
+                nl2br(htmlspecialchars($deliver->dlv_server_msg));
+        }
         require_once(SM_PATH . 'functions/display_messages.php');
         plain_error_message($msg, $color);
     } else {