diff --git a/res/layout-sw600dp-v14/address_text_view.xml b/res/layout-sw600dp-v14/address_text_view.xml
new file mode 100644
index 000000000..35997c95b
--- /dev/null
+++ b/res/layout-sw600dp-v14/address_text_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.email.activity.ChipsAddressTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inputType="textEmailAddress|textMultiLine"
+    android:imeOptions="actionNext"
+    style="@style/message_compose_header_field_value"/>
\ No newline at end of file
diff --git a/res/layout-sw600dp/address_text_view.xml b/res/layout-sw600dp/address_text_view.xml
new file mode 100644
index 000000000..c0ca115b4
--- /dev/null
+++ b/res/layout-sw600dp/address_text_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.email.activity.AddressTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inputType="textEmailAddress|textMultiLine"
+    android:imeOptions="actionNext"
+    style="@style/message_compose_header_field_value"/>
\ No newline at end of file
diff --git a/res/layout-sw600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml
index af97cf1e2..efd48f7fb 100644
--- a/res/layout-sw600dp/message_compose.xml
+++ b/res/layout-sw600dp/message_compose.xml
@@ -74,12 +74,8 @@
                             style="@style/message_compose_header_field_label"
                             android:text="@string/message_compose_to_label"
                             />
-                        <com.android.email.activity.AddressTextView
-                            android:id="@+id/to"
-                            style="@style/message_compose_header_field_value"
-                            android:inputType="textEmailAddress"
-                            android:imeOptions="actionNext"
-                            />
+                        <include android:id="@+id/to"
+                            layout="@layout/address_text_view"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -98,12 +94,8 @@
                                 style="@style/message_compose_header_field_label"
                                 android:text="@string/message_compose_cc_label"
                                 />
-                            <com.android.email.activity.AddressTextView
-                                android:id="@+id/cc"
-                                style="@style/message_compose_header_field_value"
-                                android:inputType="textEmailAddress"
-                                android:imeOptions="actionNext"
-                                />
+                            <include android:id="@+id/cc"
+                                layout="@layout/address_text_view"/>
                         </LinearLayout>
 
                         <!-- bcc: -->
@@ -115,12 +107,8 @@
                                 style="@style/message_compose_header_field_label"
                                 android:text="@string/message_compose_bcc_label"
                                 />
-                            <com.android.email.activity.AddressTextView
-                                android:id="@+id/bcc"
-                                style="@style/message_compose_header_field_value"
-                                android:inputType="textEmailAddress"
-                                android:imeOptions="actionNext"
-                                />
+                            <include android:id="@+id/bcc"
+                                layout="@layout/address_text_view"/>
                         </LinearLayout>
                     </LinearLayout>