From 6c3d00b56642b1517c70d6359689a6caa4ac959f Mon Sep 17 00:00:00 2001
From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 7 Jan 2007 15:37:08 +0000
Subject: [PATCH] improve smtp delivery failed message.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12091 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/compose.php   | 3 ++-
 src/read_body.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/compose.php b/src/compose.php
index 19d34d3a..de1c2f01 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1609,7 +1609,8 @@ function deliverMessage($composeMessage, $draft=false) {
     }
     if (!$success) {
         // $deliver->dlv_server_msg is not always server's reply
-        $msg  = $deliver->dlv_msg;
+        $msg = _("Message not sent.") . "<br />\n" .
+            $deliver->dlv_msg;
         if (!empty($deliver->dlv_server_msg)) {
             // add 'server replied' part only when it is not empty.
             // Delivery error can be generated by delivery class itself
diff --git a/src/read_body.php b/src/read_body.php
index ec67a5b9..10c372b3 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -273,7 +273,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
-        $msg = $deliver->dlv_msg;
+        $msg = _("Message not sent.") . "<br />\n" .
+            $deliver->dlv_msg;
         if (! empty($deliver->dlv_server_msg)) {
             $msg.= '<br />' .
                 _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
-- 
2.25.1