From 09941ea763db08c7b13263fae68cf6eb01bc7bcf Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 13 Oct 2005 21:53:33 +0000
Subject: Some error messages added

---
 program/steps/mail/compose.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail/compose.inc')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f65e4ff7b..52b64d804 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -404,7 +404,7 @@ function rcmail_compose_subject($attrib)
   // create a reply-subject
   else if (isset($REPLY_MESSAGE['subject']))
     {
-    if (strpos($REPLY_MESSAGE['subject'], 'Re:')===0)
+    if (eregi('^re:', $REPLY_MESSAGE['subject']))
       $subject = $REPLY_MESSAGE['subject'];
     else
       $subject = 'Re: '.$REPLY_MESSAGE['subject'];
@@ -412,7 +412,12 @@ function rcmail_compose_subject($attrib)
 
   // create a forward-subject
   else if (isset($FORWARD_MESSAGE['subject']))
-    $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
+    {
+    if (eregi('^fwd:', $REPLY_MESSAGE['subject']))
+      $subject = $FORWARD_MESSAGE['subject'];
+    else
+      $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
+    }
 
   
   $out = $form_start ? "$form_start\n" : '';
-- 
cgit v1.2.3