From 7902df457d3401c83f78a6ddd48df1a7f07f68b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 20 Oct 2005 18:20:26 -0400
Subject: [PATCH] Fixed SSL support; improved Courier compatibility; some visual enhancements and bugfixes
---
program/steps/mail/compose.inc | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 03f508b..f7e094a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -403,11 +403,21 @@
// create a reply-subject
else if (isset($REPLY_MESSAGE['subject']))
- $subject = 'Re: '.$REPLY_MESSAGE['subject'];
+ {
+ if (eregi('^re:', $REPLY_MESSAGE['subject']))
+ $subject = $REPLY_MESSAGE['subject'];
+ else
+ $subject = 'Re: '.$REPLY_MESSAGE['subject'];
+ }
// 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" : '';
@@ -499,7 +509,7 @@
rcube_label('normal'),
rcube_label('high'),
rcube_label('highest')),
- array(1, 2, 0, 4, 5));
+ array(5, 4, 0, 2, 1));
$sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
--
Gitblit v1.9.1