diff --git a/ChangeLog b/ChangeLog
index 7b9d7666f..fb29ac4a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* SOPE/GDLContentStore/GCSAlarmsFolder.m
 	We now check for non-nil values before calling
 	-timeInterval...
+	* SoObjects/Mailer/SOGoMailAccount.m
+	We try to fallback to the imap server prior falling
+	back to localhost
 
 2010-11-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index e2d8e45ff..1d2845d66 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -353,7 +353,22 @@ static NSString *sieveScriptName = @"sogo";
       
   if (!sieveServer)
     {
+      NSString *s;
+
       sieveServer = @"localhost";
+      s = [dd imapServer];
+
+      if (s)
+	{
+	  NSURL *url;
+	  
+	  url = [NSURL URLWithString: s];
+
+	  if ([url host])
+	    sieveServer = [url host];
+	  else
+	    sieveServer = s;
+	}
     }
   else
     {