diff --git a/ChangeLog b/ChangeLog
index ae3a51379..67fcdcf36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxMailToSelection.js
+	(addressFieldChanged): remove commas before testing email regexp.
+
 2012-01-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/UIxFilterEditor.js (setupNewFilterData):
diff --git a/Documentation/SOGo Native Microsoft Outlook Configuration.odt b/Documentation/SOGo Native Microsoft Outlook Configuration.odt
index b6de9d7a8..d01f83b7a 100644
Binary files a/Documentation/SOGo Native Microsoft Outlook Configuration.odt and b/Documentation/SOGo Native Microsoft Outlook Configuration.odt differ
diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index 377624de2..0fa2d0883 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSSpecialQueries.m (-createSessionsFolderWithName:): declare
+	c_id as primary key to make sure it's indexed.
+
 2011-12-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSFolder.m (-releaseChannel:): perform the debug logging BEFORE
diff --git a/SOPE/GDLContentStore/GCSSpecialQueries.m b/SOPE/GDLContentStore/GCSSpecialQueries.m
index 84468906c..7bd771c7c 100644
--- a/SOPE/GDLContentStore/GCSSpecialQueries.m
+++ b/SOPE/GDLContentStore/GCSSpecialQueries.m
@@ -190,7 +190,7 @@
 {
   static NSString *sqlFolderFormat
     = (@"CREATE TABLE %@ (" 
-       @" c_id VARCHAR(255) NOT NULL,"
+       @" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
        @" c_value VARCHAR(255) NOT NULL,"
        @" c_creationdate INT4 NOT NULL,"
        @" c_lastseen INT4 NOT NULL)");
@@ -284,7 +284,7 @@
 {
   static NSString *sqlFolderFormat
     = (@"CREATE TABLE %@ (" 
-       @" c_id VARCHAR(255) NOT NULL,"
+       @" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
        @" c_value VARCHAR(255) NOT NULL,"
        @" c_creationdate INT NOT NULL,"
        @" c_lastseen INT NOT NULL)");
@@ -377,7 +377,7 @@
 {
   static NSString *sqlFolderFormat
     = (@"CREATE TABLE %@ (" 
-       @" c_id VARCHAR2(255) NOT NULL,"
+       @" c_id VARCHAR2(255) NOT NULL PRIMARY KEY,"
        @" c_value VARCHAR2(255) NOT NULL,"
        @" c_creationdate INTEGER NOT NULL,"
        @" c_lastseen INTEGER NOT NULL)");
diff --git a/Tests/Integration/GNUmakefile.preamble b/Tests/Integration/GNUmakefile.preamble
index 4d20462de..90cc86a41 100644
--- a/Tests/Integration/GNUmakefile.preamble
+++ b/Tests/Integration/GNUmakefile.preamble
@@ -15,3 +15,5 @@ ADDITIONAL_LIB_DIRS += \
 	-L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
         -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions
+
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 4452e0613..f9f97a304 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -154,6 +154,7 @@ function addressFieldChanged(event) {
     //   "dude, buddy dude@domain.com; bro" => "dude, buddy <dude@domain.com>" + "bro"
     //   "dude, buddy, bro <bro@domain.com>" => "dude, buddy, bro <bro@domain.com>"
     //   "dude, buddy, bro" => "dude" + "buddy" + "bro"
+    //   "dude@domain.com, <buddy@domain.com>" => "<dude@domain.com>" + "<buddy@domain.com>"
     var addresses = this.value.split(';');
     if (addresses.length > 0) {
         var first = true;
@@ -161,7 +162,7 @@ function addressFieldChanged(event) {
             var words = addresses[i].split(' ');
             var phrase = new Array();
             for (var j = 0; j < words.length; j++) {
-                var word = words[j].strip().replace(/<(.+)>/, "$1");
+                var word = words[j].strip().replace(/<(.+)>/, "$1").replace(',', '');
                 if (word.length > 0) {
                     // Use the regexp defined in generic.js
                     if (emailRE.test(word)) {
@@ -176,7 +177,7 @@ function addressFieldChanged(event) {
                         phrase = new Array();
                     }
                     else
-                        phrase.push(word);
+                        phrase.push(words[j].strip());
                 }
             }
             if (phrase.length > 0) {