From 3dbfb53f2b2f3e5c3befcf74f6580d2e2d307622 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 29 May 2014 08:39:24 +0200
Subject: [PATCH] Remove (was: ...) from message subject on reply (#1489375)

---
 CHANGELOG                      | 1 +
 program/steps/mail/compose.inc | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b7f39a7b0..c9e3f386b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Remove (was: ...) from message subject on reply (#1489375)
 - Update to TinyMCE 4.0 (#1489057)
 - Enable autolink plugin in TinyMCE (#1488845)
 - Support image operations with Imagick extension (#1489734)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6a0139d72..c44ba434a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1457,6 +1457,9 @@ function rcmail_compose_subject($attrib)
             $subject = $MESSAGE->subject;
         else
             $subject = 'Re: '.$MESSAGE->subject;
+
+        // replace (was: ...) (#1489375)
+        $subject = preg_replace('/\s*\([wW]as:[^\)]+\)\s*$/', '', $subject);
     }
     // create a forward-subject
     else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {