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..43afd68f8 100644
Binary files a/Documentation/SOGo Native Microsoft Outlook Configuration.odt and b/Documentation/SOGo Native Microsoft Outlook Configuration.odt differ
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) {
diff --git a/debian/control b/debian/control
index 508b12a65..7f20d1028 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: sogo
 Priority: optional
 Maintainer: Inverse Support <support@inverse.ca>
-Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev
+Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev
 Section: web
 Standards-Version: 3.9.1
 
 Package: sogo
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make
+Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3
 Suggests: nginx
 Description: a modern and scalable groupware
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
diff --git a/sogo.spec b/sogo.spec
index e6f3590f7..65129011d 100644
--- a/sogo.spec
+++ b/sogo.spec
@@ -17,7 +17,14 @@ Prefix:       /usr
 AutoReqProv:  off
 Requires:     gnustep-base >= 1.23, sope%{sope_major_version}%{sope_minor_version}-core, httpd, sope%{sope_major_version}%{sope_minor_version}-core, sope%{sope_major_version}%{sope_minor_version}-appserver, sope%{sope_major_version}%{sope_minor_version}-ldap, sope%{sope_major_version}%{sope_minor_version}-cards >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore >= %{sogo_version}, sope%{sope_major_version}%{sope_minor_version}-sbjson, memcached, libmemcached
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}
-BuildPreReq:  gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel %{?oc_build_depends}
+BuildRequires:  gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{sope_minor_version}-appserver-devel sope%{sope_major_version}%{sope_minor_version}-core-devel sope%{sope_major_version}%{sope_minor_version}-ldap-devel sope%{sope_major_version}%{sope_minor_version}-mime-devel sope%{sope_major_version}%{sope_minor_version}-xml-devel sope%{sope_major_version}%{sope_minor_version}-gdl1-devel sope%{sope_major_version}%{sope_minor_version}-sbjson-devel libmemcached-devel %{?oc_build_depends}
+
+
+# Required by MS Exchange freebusy lookups
+%{?el5:Requires: curl}
+%{?el5:BuildRequires: curl-devel}
+%{?el6:Requires: libcurl}
+%{?el6:BuildRequires: libcurl-devel}
 
 %description
 SOGo is a groupware server built around OpenGroupware.org (OGo) and