diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
index 8759609d2..fd30f99ec 100644
--- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
index bea0f9287..4cb7e385b 100644
--- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Redirigir missatges entrants";
-"Forward to address :" = "Redirigir a l'adreça :";
 "Keep a copy" = "Desar-ne una còpia";
 "Please specify an address to which you want to forward your messages."
 = "Especifiqueu l'adreça a la qual voleu redirigir els missatges.";
diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings
index 484f96545..5f15cf79d 100644
--- a/UI/PreferencesUI/Czech.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Přeposílat příchozí zprávy";
-"Forward to address :" = "Přeposílat na adresu :";
 "Keep a copy" = "Ponechat kopii";
 "Please specify an address to which you want to forward your messages."
 = "Prosím zadejte adresu, na kterou chcete své zprávy přeposílat.";
diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
index 211f32f22..07bad8af5 100644
--- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index fe036a9fd..390cabac9 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
@@ -108,6 +107,7 @@
 
 /* Mailer */
 "Show subscribed mailboxes only" = "Show subscribed mailboxes only";
+"Sort messages by threads" = "Sort messages by threads";
 "Check for new mail:" = "Check for new mail:";
 "messagecheck_manually" = "Manually";
 "messagecheck_every_minute" = "Every minute";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 4ffb2e0b4..9610c709d 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Transférer les messages entrant";
-"Forward to address :" = "Adresse de destination :";
 "Keep a copy" = "Garder une copie";
 "Please specify an address to which you want to forward your messages."
 = "Veuillez définir une adresse à laquelle vous désirez transférer automatiquement vos nouveaux messages.";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 217073650..69b83e968 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Ankommende Nachrichten weiterleiten";
-"Forward to address :" = "Weiterleiten an :";
 "Keep a copy" = "Kopie behalten";
 "Please specify an address to which you want to forward your messages."
 = "Bitte Adresse angeben, an die Nachrichten weitergeleitet werden sollen.";
diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
index a3606a511..6d962735e 100644
--- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
index e4d29e4b4..1ef7cbf6f 100644
--- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Áframsenda skilaboð sem berast";
-"Forward to address :" = "Áframsenda á netfangið :";
 "Keep a copy" = "Halda afriti eftir";
 "Please specify an address to which you want to forward your messages."
 = "Hér þarf að skrá netfangið sem ný skilaboð eiga að áframsendast á";
diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings
index 712ca0df3..8f837d84e 100644
--- a/UI/PreferencesUI/Italian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings
@@ -33,7 +33,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Inoltra i messaggi in arrivo";
-"Forward to address :" = "Inoltra all'indirizzo :";
 "Keep a copy" = "Lascia una copia";
 "Please specify an address to which you want to forward your messages."
 = "Prego specificare l'indirizzo verso quale inoltrare i messaggi.";
diff --git a/UI/PreferencesUI/Norwegian.lproj/Localizable.strings b/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
index 7736be0f4..950f28eab 100644
--- a/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Videresend innkommende e-post";
-"Forward to address :" = "Videresend til adresse:";
 "Keep a copy" = "Behold en kopi";
 "Please specify an address to which you want to forward your messages."
 = "Angi adressen du vil videresende dine meldinger til.";
diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings
index 987469f35..08c6fe575 100644
--- a/UI/PreferencesUI/Polish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings
@@ -33,7 +33,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Przekaż przychodzące wiadomości";
-"Forward to address :" = "Przekaż na adres :";
 "Keep a copy" = "Zatrzymaj kopię";
 "Please specify an address to which you want to forward your messages."
 = "Podaj adres, na który chcesz przekazywać wiadomości.";
diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings
index dfa7d2467..b911512e1 100644
--- a/UI/PreferencesUI/Russian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Spanish.lproj/Localizable.strings b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
index 47f339e0c..d7f0b222b 100644
--- a/UI/PreferencesUI/Spanish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Desvío de mensajes recibidos";
-"Forward to address :" = "Desviar a la dirección :";
 "Keep a copy" = "Guardar una copia";
 "Please specify an address to which you want to forward your messages."
 = "Por favor, especificar una dirección para aquellos mensajes que quiere desviar.";
diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
index 96a2e24bb..e48b70b74 100644
--- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Vidarebefordra inkommande meddelanden";
-"Forward to address :" = "Vidarebefordra till adress:";
 "Keep a copy" = "Spara en kopia";
 "Please specify an address to which you want to forward your messages."
 = "Ange adressen du vill vidarebefordra dina meddelanden till.";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index bb087356e..246546e64 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -859,13 +859,23 @@
 
 - (void) setForwardAddress: (NSString *) forwardAddress
 {
-  [forwardOptions setObject: forwardAddress
+  NSArray *addresses;
+
+  addresses = [[forwardAddress componentsSeparatedByString: @","]
+                trimmedComponents];
+  [forwardOptions setObject: addresses
 		     forKey: @"forwardAddress"];
 }
 
 - (NSString *) forwardAddress
 {
-  return [forwardOptions objectForKey: @"forwardAddress"];
+  id addresses;
+
+  addresses = [forwardOptions objectForKey: @"forwardAddress"];
+
+  return ([addresses respondsToSelector: @selector(componentsJoinedByString:)]
+          ? [(NSArray *)addresses componentsJoinedByString: @", "]
+          : (NSString *)addresses);
 }
 
 - (void) setForwardKeepCopy: (BOOL) keepCopy
diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
index 795207036..f5442fa85 100644
--- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
@@ -35,7 +35,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Перенаправляти вхідні повідомлення";
-"Forward to address :" = "Перенаправляти на адреси :";
 "Keep a copy" = "Зберігати копію";
 "Please specify an address to which you want to forward your messages."
 = "Будь ласка, зазначте адресу, на яку потрібно перенаправляти повідомлення, адресовані Вам.";
diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
index 40a8d2b6d..d4d9d220e 100644
--- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -32,7 +32,6 @@
 
 /* forward messages */
 "Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
 "Keep a copy" = "Keep a copy";
 "Please specify an address to which you want to forward your messages."
 = "Please specify an address to which you want to forward your messages.";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index f0fdfe50c..b5b534412 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -376,12 +376,11 @@
                 <var:string label:value="Forward incoming messages"/></label><br/>
               
               <div id="forward">
-                <label><var:string label:value="Forward to address :"/> 
-                  <input type="text" 
-                    const:id="forwardAddress" 
-                    const:name="forwardAddress"
-                    var:value="forwardAddress"
-                    size="30" /></label><br/>
+                <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
+                  <textarea const:name="forwardAddress"
+                    const:id="forwardAddress"
+                    var:value="forwardAddress" />
+                </label><br/>
 
                 <label><input type="checkbox" 
                     const:name="forwardKeepCopy"
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 5a0a8a3d3..31374f9ef 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -66,16 +66,18 @@ DIV.listWrapper
   border-left: 1px solid #9b9b9b;
   background: #ccddec; }
 
-/* vacation */
+/* vacation, forward */
 #vacation, #forward
 { padding-left: 2.5em; }
 #vacation LABEL
 { margin-left: 0; }
-#vacation TEXTAREA
+#vacation TEXTAREA,
+#forward TEXTAREA
 { width: 100%; }
 #vacation TEXTAREA#autoReplyText
 { height: 100px; }
-#vacation TEXTAREA#autoReplyEmailAddresses
+#vacation TEXTAREA#autoReplyEmailAddresses,
+#forward TEXTAREA
 { height: 50px; }
 #vacation SPAN
 { float: right; }
@@ -87,7 +89,7 @@ DIV.listWrapper
 DIV#filtersListWrapper
 { bottom: 30px;
   right: 2em;
-  top: 154px;
+  top: 164px;
   left: 2em; }
 
 TABLE#filtersList
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 417a08e4c..f7272d0f3 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -37,10 +37,12 @@ function savePreferences(sender) {
     }
 
     if ($("enableForward") && $("enableForward").checked) {
-        if (!emailRE.test($("forwardAddress").value)) {
-            alert(_("Please specify an address to which you want to forward your messages."));
-            sendForm = false;
-        }
+        var addresses = $("forwardAddress").value.split(",");
+        for (var i = 0; i < addresses.length && sendForm; i++)
+            if (!emailRE.test(addresses[i].strip())) {
+                alert(_("Please specify an address to which you want to forward your messages."));
+                sendForm = false;
+            }
     }
 
     if (isSieveScriptsEnabled) {