From 861a90b970c1395d8ab2086a907a83ece3e160bc Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 8 Nov 2010 17:04:29 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: b35d04c6cd2614e48feea1b1dacb0a61aa27fe44
Monotone-Revision: 19bd38381f65942b0903a2e2aaa8abbc9c9862ab

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-11-08T17:04:29
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                          |  3 +++
 SoObjects/Mailer/SOGoMailAccount.m | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

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
     {