See ChangeLog

Monotone-Parent: c3c5403094c30c3fc814d898f3de659d0ca951fc
Monotone-Revision: cdffa33720324e664e37834e059eaa9964d13092

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-05-27T20:53:16
Monotone-Branch: ca.inverse.sogo

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