diff --git a/ChangeLog b/ChangeLog
index aa3c0f813..5143efd79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-01  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailAccount.m (-updateFilters): write
+	multiple 'redirect' directives when forwarding to multiple email
+	addresses.
+
 2011-05-31  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js (initCalendarSelector): use
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 1e91b9c24..df63b8007 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -358,13 +358,22 @@ static NSString *sieveScriptName = @"sogo";
 
   if (values && [[values objectForKey: @"enabled"] boolValue])
     {
+      id addresses;
+      int i;
+
       b = YES;
       
-      v = [values objectForKey: @"forwardAddress"];
-
-      if (v && [v length] > 0)
-	[script appendFormat: @"redirect \"%@\";\r\n", v];
+      addresses = [values objectForKey: @"forwardAddress"];
+      if ([addresses isKindOfClass: [NSString class]])
+        addresses = [NSArray arrayWithObject: addresses];
 
+      for (i = 0; i < [addresses count]; i++)
+	{
+          v = [addresses objectAtIndex: i];
+          if (v && [v length] > 0)
+            [script appendFormat: @"redirect \"%@\";\r\n", v];
+        }
+      
       if ([[values objectForKey: @"keepCopy"] boolValue])
 	[script appendString: @"keep;\r\n"];
     }