diff --git a/NEWS b/NEWS
index 18a4a3fe5..54edfe468 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Bug fixes
  - improved dramatically the BSON decoding speed
  - added WindowSize support for GCS collections when using EAS
  - fixed IMAP search with non-ASCII folder names
+ - fixed extraction of email addresses when pasting text with tabs (#2945)
 
 2.2.9a (2014-09-29)
 -------------------
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index f9f97a304..19d837937 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -159,7 +159,10 @@ function addressFieldChanged(event) {
     if (addresses.length > 0) {
         var first = true;
         for (var i = 0; i < addresses.length; i++) {
-            var words = addresses[i].split(' ');
+            var words = addresses[i]
+                .replace('\t', ' ')
+                .replace(/,(?! )/, ', ')
+                .split(' ');
             var phrase = new Array();
             for (var j = 0; j < words.length; j++) {
                 var word = words[j].strip().replace(/<(.+)>/, "$1").replace(',', '');