Merge "Use "," as a recipients divider."
diff --git a/src/com/android/mail/providers/MessageModification.java b/src/com/android/mail/providers/MessageModification.java
index add832e..b7bc6bf 100644
--- a/src/com/android/mail/providers/MessageModification.java
+++ b/src/com/android/mail/providers/MessageModification.java
@@ -31,9 +31,6 @@
  * provide an empty ContentValues.
  */
 public class MessageModification {
-
-    private static final CharSequence EMAIL_SEPARATOR = ",";
-
     /**
      * Sets the message's subject. Only valid for drafts.
      * @param values the ContentValues that will be used to create or update the
@@ -51,7 +48,7 @@
      * @param toAddresses the new to addresses
      */
     public static void putToAddresses(ContentValues values, String[] toAddresses) {
-        values.put(MessageColumns.TO, TextUtils.join(EMAIL_SEPARATOR, toAddresses));
+        values.put(MessageColumns.TO, TextUtils.join(UIProvider.EMAIL_SEPARATOR, toAddresses));
     }
 
     /**
@@ -61,7 +58,7 @@
      * @param ccAddresses the new cc addresses
      */
     public static void putCcAddresses(ContentValues values, String[] ccAddresses) {
-        values.put(MessageColumns.CC, TextUtils.join(EMAIL_SEPARATOR, ccAddresses));
+        values.put(MessageColumns.CC, TextUtils.join(UIProvider.EMAIL_SEPARATOR, ccAddresses));
     }
 
     /**
@@ -71,7 +68,7 @@
      * @param bccAddresses the new bcc addresses
      */
     public static void putBccAddresses(ContentValues values, String[] bccAddresses) {
-        values.put(MessageColumns.BCC, TextUtils.join(EMAIL_SEPARATOR, bccAddresses));
+        values.put(MessageColumns.BCC, TextUtils.join(UIProvider.EMAIL_SEPARATOR, bccAddresses));
     }
 
     /**
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index fb067b4..4fa1d5d 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -31,7 +31,7 @@
 import java.util.ArrayList;
 
 public class UIProvider {
-    public static final String EMAIL_SEPARATOR = "\n";
+    public static final String EMAIL_SEPARATOR = ",";
     public static final long INVALID_CONVERSATION_ID = -1;
     public static final long INVALID_MESSAGE_ID = -1;