Merge "Fix dangling comma in 'to view' when filled from intent."
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 1d51e3a..6a3877f 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -2068,7 +2068,10 @@
             } else {
                 to = decode(mailToString.substring(length, index));
             }
-            addAddresses(mToView, to.split(" ,"));
+
+            if (!TextUtils.isEmpty(to.trim())) {
+                addAddresses(mToView, to.split(" ,"));
+            }
         } catch (UnsupportedEncodingException e) {
             Log.e(Logging.LOG_TAG, e.getMessage() + " while decoding '" + mailToString + "'");
         }