diff --git a/ChangeLog b/ChangeLog
index 3ab3ad885..7de279d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
 	* SoObjects/Appointments/SOGoAppointmentFolder.h/m:
 	-importCalendar: we now also import the timezone definition
 	when present
-
+	* SoObjects/SOGo/SQLSource.m 
+	We now consider the domain belonging to the SQLSource instance
+	
 2011-02-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailContext.[hm]: renamed from
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index 146594c75..94e79a972 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -1,6 +1,6 @@
 /* SOGoContactFolders.m - this file is part of SOGo
  *
- * Copyright (C) 2006, 2007 Inverse inc.
+ * Copyright (C) 2006-2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index b996b8d02..407a07650 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -243,11 +243,11 @@
 - (NSDictionary *) _lookupContactEntry: (NSString *) theID
                          considerEmail: (BOOL) b
 {
+  NSMutableDictionary *response;
   EOAdaptorChannel *channel;
   GCSChannelManager *cm;
+  NSString *sql, *value;
   NSException *ex;
-  NSString *sql;
-  NSMutableDictionary *response;
 
   response = nil;
 
@@ -290,6 +290,13 @@
           [response setObject: [NSNumber numberWithBool: YES] forKey: @"CalendarAccess"];
           [response setObject: [NSNumber numberWithBool: YES] forKey: @"MailAccess"];
 
+	  // We set the domain, if any
+	  if (_domain)
+	    value = _domain;
+	  else
+	    value = @"";
+	  [response setObject: value forKey: @"c_domain"];
+
 	  // We populate all mail fields
 	  emails = [NSMutableArray array];