diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7b3c4e06..4b83ea840 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -78,7 +78,7 @@
         </activity>
         <activity
             android:name=".activity.setup.AccountSettings"
-            android:label="@string/account_settings_title_fmt"
+            android:label="@string/account_settings_action"
             >
         </activity>
 
@@ -104,20 +104,21 @@
             android:enabled="false"
             >
             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SENDTO" />
                 <data android:scheme="mailto" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.SEND" />
                 <data android:mimeType="image/*" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <data android:scheme="mailto" />
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.SEND" />
+                <data android:mimeType="text/plain" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
         </activity>
         <receiver android:name=".service.BootReceiver"
diff --git a/res/drawable-land/bottombar_565.png b/res/drawable-land/bottombar_565.png
deleted file mode 100644
index 612185670..000000000
Binary files a/res/drawable-land/bottombar_565.png and /dev/null differ
diff --git a/res/drawable/bottombar_565.png b/res/drawable/bottombar_565.png
deleted file mode 100644
index 1fdb07815..000000000
Binary files a/res/drawable/bottombar_565.png and /dev/null differ
diff --git a/res/drawable/ic_email_thread_open_bottom_default.9.png b/res/drawable/ic_email_thread_open_bottom_default.9.png
deleted file mode 100644
index 99ff6fb01..000000000
Binary files a/res/drawable/ic_email_thread_open_bottom_default.9.png and /dev/null differ
diff --git a/res/drawable/ic_menu_attachment.png b/res/drawable/ic_menu_attachment.png
deleted file mode 100644
index d5929e84b..000000000
Binary files a/res/drawable/ic_menu_attachment.png and /dev/null differ
diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
index bd8962b76..45a9eda43 100644
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@@ -39,25 +39,28 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="57px"
-        android:background="@drawable/ic_email_thread_open_bottom_default"
-        android:gravity="center_vertical">
+        android:layout_height="wrap_content"
+        android:paddingTop="5dip"
+        android:paddingLeft="4dip"
+        android:paddingRight="4dip"
+        android:paddingBottom="1dip"    
+        android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/reply"
             android:text="@string/reply_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
         <Button
             android:id="@+id/reply_all"
             android:text="@string/reply_all_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
         <Button
             android:id="@+id/delete"
             android:text="@string/delete_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
     </LinearLayout>
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 6440fb8ff..31efc8551 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -29,15 +29,14 @@
     <EditText
         android:id="@+id/account_email"
         android:hint="@string/account_setup_basics_email_hint"
-        android:singleLine="true"
+        android:inputType="textEmailAddress"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         />
     <EditText
         android:id="@+id/account_password"
         android:hint="@string/account_setup_basics_password_hint"
-        android:password="true"
-        android:singleLine="true"
+        android:inputType="textPassword"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:nextFocusDown="@+id/next"
@@ -56,8 +55,8 @@
         />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
-        android:background="@drawable/bottombar_565"
+        android:layout_height="54dip"
+        android:background="@android:drawable/bottom_bar"
         >
         <Button
             android:id="@+id/manual_setup"
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index b719a71dd..3d5017037 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -41,8 +41,8 @@
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
-        android:background="@drawable/bottombar_565">
+        android:layout_height="54dip"
+        android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/cancel"
             android:text="@string/cancel_action"
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 68ec7dba8..2414a5dee 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -31,7 +31,7 @@
             android:textColor="?android:attr/textColorPrimary" />
         <EditText
             android:id="@+id/account_username"
-            android:singleLine="true"
+            android:inputType="textEmailAddress"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <TextView
@@ -42,8 +42,7 @@
             android:textColor="?android:attr/textColorPrimary" />
         <EditText
             android:id="@+id/account_password"
-            android:password="true"
-            android:singleLine="true"
+            android:inputType="textPassword"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <!-- This text may be changed in code if the server is IMAP, etc. -->
@@ -54,9 +53,10 @@
             android:layout_width="fill_parent"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary" />
+        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
         <EditText
             android:id="@+id/account_server"
-            android:singleLine="true"
+            android:inputType="textUri"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <TextView
@@ -67,7 +67,7 @@
             android:textColor="?android:attr/textColorPrimary" />
         <EditText
             android:id="@+id/account_port"
-            android:singleLine="true"
+            android:inputType="number"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <TextView
@@ -105,7 +105,7 @@
             <EditText
                 android:id="@+id/imap_path_prefix"
                 android:hint="@string/account_setup_incoming_imap_path_prefix_hint"
-                android:singleLine="true"
+                inputType="text"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
         </LinearLayout>
@@ -115,8 +115,8 @@
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="54px"
-            android:background="@drawable/bottombar_565">
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
             <Button
                 android:id="@+id/next"
                 android:text="@string/next_action"
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index 73cf15eb3..0930ca53c 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -33,7 +33,7 @@
         android:textColor="?android:attr/textColorPrimary" />
     <EditText
         android:id="@+id/account_description"
-        android:singleLine="true"
+        android:inputType="textCapWords"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent" />
     <TextView
@@ -44,7 +44,7 @@
         android:textColor="?android:attr/textColorPrimary" />
     <EditText
         android:id="@+id/account_name"
-        android:singleLine="true"
+        android:inputType="textPersonName"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent" />
     <View
@@ -53,8 +53,8 @@
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
-        android:background="@drawable/bottombar_565">
+        android:layout_height="54dip"
+        android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/done"
             android:text="@string/done_action"
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index 7cb2e67e9..a0a4e7316 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -45,8 +45,8 @@
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
-        android:background="@drawable/bottombar_565">
+        android:layout_height="54dip"
+        android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/next"
             android:text="@string/next_action"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index d27b2ec13..02de415bf 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -29,9 +29,10 @@
             android:layout_width="fill_parent"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary" />
+        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
         <EditText
             android:id="@+id/account_server"
-            android:singleLine="true"
+            android:inputType="textUri"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <TextView
@@ -42,7 +43,7 @@
             android:textColor="?android:attr/textColorPrimary" />
         <EditText
             android:id="@+id/account_port"
-            android:singleLine="true"
+            android:inputType="number"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
         <TextView
@@ -74,7 +75,7 @@
                 android:textColor="?android:attr/textColorPrimary" />
             <EditText
                 android:id="@+id/account_username"
-                android:singleLine="true"
+                android:inputType="textEmailAddress"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
             <TextView
@@ -85,8 +86,7 @@
                 android:textColor="?android:attr/textColorPrimary" />
             <EditText
                 android:id="@+id/account_password"
-                android:password="true"
-                android:singleLine="true"
+                android:inputType="textPassword"
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent" />
         </LinearLayout>
@@ -96,8 +96,8 @@
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="54px"
-            android:background="@drawable/bottombar_565">
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
             <Button
                 android:id="@+id/next"
                 android:text="@string/next_action"
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index 83e8bd43a..f1f0792f3 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -40,8 +40,8 @@
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="54px"
-            android:background="@drawable/bottombar_565">
+            android:layout_height="54dip"
+            android:background="@android:drawable/bottom_bar">
             <Button
                 android:id="@+id/add_new_account"
                 android:layout_width="wrap_content"
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index f04b72249..3cda691c3 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -33,6 +33,7 @@
                     android:textColor="?android:attr/textColorSecondaryInverse"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
+                    android:inputType="textEmailAddress|textMultiLine"
                     android:hint="@string/message_compose_to_hint" />
                 <MultiAutoCompleteTextView
                     android:id="@+id/cc" android:layout_width="fill_parent"
@@ -41,6 +42,7 @@
                     android:textColor="?android:attr/textColorSecondaryInverse"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
+                    android:inputType="textEmailAddress|textMultiLine"
                     android:hint="@string/message_compose_cc_hint"
                     android:visibility="gone" />
                 <MultiAutoCompleteTextView
@@ -50,18 +52,18 @@
                     android:textColor="?android:attr/textColorSecondaryInverse"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
+                    android:inputType="textEmailAddress|textMultiLine"
                     android:hint="@string/message_compose_bcc_hint"
                     android:visibility="gone" />
                 <EditText android:id="@+id/subject"
                     android:layout_width="fill_parent"
-                    android:singleLine="true"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:textColor="?android:attr/textColorSecondaryInverse"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
                     android:hint="@string/message_compose_subject_hint"
-                    android:autoText="true" android:capitalize="sentences" />
+                    android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine" />
                 <!--
                     Empty container for storing attachments. We'll stick
                     instances of message_compose_attachment.xml in here.
@@ -81,8 +83,8 @@
                 android:layout_weight="1.0"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:gravity="left|top"
-                android:minLines="3" android:autoText="true"
-                android:capitalize="sentences" />
+                android:minLines="3"
+                android:inputType="textMultiLine|textAutoCorrect|textCapSentences" />
         <!--  quoted text bar -->
             <RelativeLayout android:id="@+id/quoted_text_bar"
                 android:layout_width="fill_parent"
@@ -106,17 +108,33 @@
                 android:layout_width="fill_parent" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:orientation="horizontal"
-        android:layout_width="fill_parent" android:layout_height="54px"
-        android:background="@drawable/bottombar_565" android:gravity="center_vertical">
-        <Button android:id="@+id/send" android:text="@string/send_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
+    
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dip"
+        android:paddingLeft="4dip"
+        android:paddingRight="4dip"
+        android:paddingBottom="1dip"   
+        android:background="@android:drawable/bottom_bar" >
+        <Button
+            android:id="@+id/send"
+            android:text="@string/send_action"
+            android:layout_height="fill_parent"
+            android:layout_width="0dip"
             android:layout_weight="1" />
-        <Button android:id="@+id/save" android:text="@string/save_draft_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
+        <Button
+            android:id="@+id/save"
+            android:text="@string/save_draft_action"
+            android:layout_height="fill_parent"
+            android:layout_width="0dip"
             android:layout_weight="1" />
-        <Button android:id="@+id/discard" android:text="@string/discard_action"
-            android:layout_height="wrap_content" android:layout_width="0dip"
+        <Button
+            android:id="@+id/discard"
+            android:text="@string/discard_action"
+            android:layout_height="fill_parent"
+            android:layout_width="0dip"
             android:layout_weight="1" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 8deab6d4e..9f1e3f8fa 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -60,25 +60,28 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="57px"
-        android:background="@drawable/ic_email_thread_open_bottom_default"
-        android:gravity="center_vertical">
+        android:layout_height="wrap_content"
+        android:paddingTop="5dip"
+        android:paddingLeft="4dip"
+        android:paddingRight="4dip"
+        android:paddingBottom="1dip"    
+        android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/reply"
             android:text="@string/reply_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
         <Button
             android:id="@+id/reply_all"
             android:text="@string/reply_all_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
         <Button
             android:id="@+id/delete"
             android:text="@string/delete_action"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
     </LinearLayout>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-cs/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-cs/build_number.xml b/res/values-cs/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-cs/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 56d470df0..8f21b8fa0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -95,7 +95,7 @@
     <string name="account_setup_names_title">"Nastavit e-mail"</string>
     <string name="account_setup_names_instructions">"Váš účet je nastaven, e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label">"Pojmenovat tento účet (nepovinné)"</string>
-    <string name="account_setup_names_user_name_label">"Vaše jméno (zobrazované na odchozích zprávách)"</string>
+    <string name="account_setup_names_user_name_label">"Vaše jméno (zobrazované v odchozích zprávách)"</string>
     <string name="account_setup_account_type_title">"Přidat nový e-mailový účet"</string>
     <string name="account_setup_account_type_instructions">"O jaký typ účtu se jedná?"</string>
     <string name="account_setup_account_type_pop_action">"Účet POP3"</string>
@@ -143,9 +143,9 @@
     <string name="account_setup_failed_dlg_server_message">"Nelze se připojit k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt">"Nelze se připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required">"Služba TLS je požadována, ale není podporována na serveru."</string>
-    <string name="account_setup_failed_auth_required">"Metody ověřování nejsou na serveru podporovány."</string>
+    <string name="account_setup_failed_auth_required">"Server nepodporuje metody ověření."</string>
     <string name="account_setup_failed_security">"Nelze navázat připojení k serveru z důvodu chyby zabezpečení."</string>
-    <string name="account_setup_failed_ioerror">"Nelze otevřít připojení k serveru."</string>
+    <string name="account_setup_failed_ioerror">"Nelze navázat připojení k serveru."</string>
     <string name="account_setup_failed_dlg_edit_details_action">"Upravit podrobnosti"</string>
     <string name="account_settings_title_fmt">"Obecná nastavení"</string>
     <string name="account_settings_default_label">"Výchozí účet"</string>
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Při příchodu e-mailu také vibrovat"</string>
     <string name="account_settings_ringtone">"Zvolit vyzváněcí tón"</string>
     <string name="account_settings_servers">"Nastavení serveru"</string>
-    <string name="account_delete_dlg_title">"Odebrat"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude z aplikace Email odebrán."</string>
     <string name="provider_note_yahoo">"Přístup do schránky není u některých poštovních účtů Yahoo! podporován. Pokud máte problémy s připojením, získáte další informace na webové stránce yahoo.com."</string>
     <string name="provider_note_yahoo_uk">"Před nastavením tohoto e-mailového účtu přejděte na web Yahoo! a povolte u tohoto účtu e-mailový přístup POP3."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 30936e738..d121ac80a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -68,8 +68,7 @@
     <string name="message_compose_error_no_recipients">"Sie müssen mindestens einen Empfänger hinzufügen."</string>
     <string name="message_compose_attachments_skipped_toast">"Einige Anhänge können nicht weitergeleitet werden, da Sie noch nicht heruntergeladen wurden."</string>
     <string name="message_view_to_label">"An:"</string>
-    <!-- no translation found for message_view_cc_label (6322992216371163122) -->
-    <skip />
+    <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Öffnen"</string>
     <string name="message_view_attachment_download_action">"Speichern"</string>
     <string name="message_view_prev_action">"Vorherige Nachricht"</string>
@@ -88,18 +87,15 @@
     <string name="account_setup_basics_password_hint">"Passwort"</string>
     <string name="account_setup_basics_default_label">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_setup_basics_manual_setup_action">"Manuelle Einrichtung"</string>
-    <!-- no translation found for account_setup_username_password_toast (4441448542557889481) -->
-    <skip />
+    <string name="account_setup_username_password_toast">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
     <string name="account_setup_check_settings_retr_info_msg">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg">"Einstellungen des Eingangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg">"Einstellungen des Ausgangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_canceling_msg">"Vorgang wird abgebrochen..."</string>
     <string name="account_setup_names_title">"E-Mail einrichten"</string>
     <string name="account_setup_names_instructions">"Ihr Konto ist nun eingerichtet."</string>
-    <!-- no translation found for account_setup_names_account_name_label (8033895024273259196) -->
-    <skip />
-    <!-- no translation found for account_setup_names_user_name_label (8967410178488604770) -->
-    <skip />
+    <string name="account_setup_names_account_name_label">"Konto benennen (optional)"</string>
+    <string name="account_setup_names_user_name_label">"Ihr Name (wird für ausgehende Nachrichten angezeigt)"</string>
     <string name="account_setup_account_type_title">"Neues E-Mail-Konto hinzufügen"</string>
     <string name="account_setup_account_type_instructions">"Um welchen Kontotyp handelt es sich hierbei?"</string>
     <string name="account_setup_account_type_pop_action">"POP3-Konto"</string>
@@ -116,8 +112,7 @@
     <string name="account_setup_incoming_security_ssl_label">"SSL (immer)"</string>
     <string name="account_setup_incoming_security_tls_optional_label">"TLS (wenn verfügbar)"</string>
     <string name="account_setup_incoming_security_tls_label">"TLS (immer)"</string>
-    <!-- no translation found for account_setup_incoming_delete_policy_label (9213590134693857912) -->
-    <skip />
+    <string name="account_setup_incoming_delete_policy_label">"E-Mail von Server löschen"</string>
     <string name="account_setup_incoming_delete_policy_never_label">"Nie"</string>
     <string name="account_setup_incoming_delete_policy_7days_label">"Nach 7 Tagen"</string>
     <string name="account_setup_incoming_delete_policy_delete_label">"Wenn ich sie aus dem Posteingang lösche"</string>
@@ -143,20 +138,14 @@
     <string name="account_setup_failed_dlg_title">"Einrichtung konnte nicht abgeschlossen werden"</string>
     <string name="account_setup_failed_dlg_auth_message">"Nutzername oder Passwort falsch"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt">"Nutzername oder Password falsch"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_dlg_certificate_message (961843413600482906) -->
-    <skip />
+    <string name="account_setup_failed_dlg_certificate_message">"Keine sichere Verbindung zu Server möglich"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt">"Keine sichere Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_dlg_server_message (1828270369532779265) -->
-    <skip />
+    <string name="account_setup_failed_dlg_server_message">"Keine Verbindung zu Server möglich"</string>
     <string name="account_setup_failed_dlg_server_message_fmt">"Keine Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_tls_required (307030406688611327) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_auth_required (1676242821459638150) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_security (6142264248671379943) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_ioerror (7391458717708933095) -->
-    <skip />
+    <string name="account_setup_failed_tls_required">"TLS erforderlich aber nicht von Server unterstützt"</string>
+    <string name="account_setup_failed_auth_required">"Authentifizierungsmethoden nicht von Server unterstützt"</string>
+    <string name="account_setup_failed_security">"Verbindung zu Server kann aufgrund eines Sicherheitsfehlers nicht geöffnet werden."</string>
+    <string name="account_setup_failed_ioerror">"Verbindung zu Server kann nicht geöffnet werden"</string>
     <string name="account_setup_failed_dlg_edit_details_action">"Details bearbeiten"</string>
     <string name="account_settings_title_fmt">"Allgemeine Einstellungen"</string>
     <string name="account_settings_default_label">"Standardkonto"</string>
@@ -174,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
     <string name="account_settings_ringtone">"Klingelton auswählen"</string>
     <string name="account_settings_servers">"Servereinstellungen"</string>
-    <string name="account_delete_dlg_title">"Entfernen"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
     <string name="provider_note_yahoo">"Der Zugang zum Postfach bestimmter E-Mail-Konten von Yahoo! wird nicht unterstützt. Bei Verbindungsproblemen besuchen Sie die Website von Yahoo! für weitere Informationen."</string>
     <string name="provider_note_yahoo_uk">"Vor Eröffnung dieses E-Mail-Kontos bitte die Website von Yahoo! besuchen und E-Mail-Zugang über POP3 für dieses Konto aktivieren."</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-es/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-es/build_number.xml b/res/values-es/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-es/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f02cd3500..409c06be6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -95,7 +95,7 @@
     <string name="account_setup_names_title">"Configurar correo electrónico"</string>
     <string name="account_setup_names_instructions">"Tu cuenta ya está configurada y el correo electrónico está por llegar."</string>
     <string name="account_setup_names_account_name_label">"Asignar un nombre a esta cuenta (opcional)"</string>
-    <string name="account_setup_names_user_name_label">"Tu nombre (aparecerá en los mensajes salientes)"</string>
+    <string name="account_setup_names_user_name_label">"Tu nombre (aparece en los mensajes salientes)"</string>
     <string name="account_setup_account_type_title">"Añadir una cuenta de correo electrónico nueva"</string>
     <string name="account_setup_account_type_instructions">"¿Qué tipo de cuenta es ésta?"</string>
     <string name="account_setup_account_type_pop_action">"Cuenta POP3"</string>
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Vibrar también cuando llegue un mensaje"</string>
     <string name="account_settings_ringtone">"Seleccionar tono de llamada"</string>
     <string name="account_settings_servers">"Configuración del servidor"</string>
-    <string name="account_delete_dlg_title">"Eliminar"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Se va a eliminar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" de \"Correo electrónico\"."</string>
     <string name="provider_note_yahoo">"Algunos tipos de cuentas de correo de Yahoo! no permiten acceder al buzón de correo. Si tienes problemas de conexión, visita yahoo.com para obtener información adicional al respecto."</string>
     <string name="provider_note_yahoo_uk">"Antes de configurar esta cuenta de correo electrónico, visita el sitio web de Yahoo! y habilita el acceso al correo electrónico POP3 para esta cuenta."</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-fr/build_number.xml b/res/values-fr/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-fr/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8fe1f8083..b7fb648d9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Vibrer également lors de la réception d\'un e-mail"</string>
     <string name="account_settings_ringtone">"Sélectionner la sonnerie"</string>
     <string name="account_settings_servers">"Paramètres du serveur"</string>
-    <string name="account_delete_dlg_title">"Supprimer"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
     <string name="provider_note_yahoo">"L\'accès à la boîte aux lettres n\'est pas possible avec certains types de comptes Yahoo!. En cas de problème de connexion, consultez le site yahoo.fr pour obtenir plus d\'informations."</string>
     <string name="provider_note_yahoo_uk">"Avant de configurer ce compte de messagerie, veuillez consulter le site de Yahoo! et activer l\'accès POP3 pour ce compte."</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-it/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-it/build_number.xml b/res/values-it/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-it/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f1eb249b9..2d774a2d6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Attiva anche vibrazione all\'arrivo di email"</string>
     <string name="account_settings_ringtone">"Seleziona suoneria"</string>
     <string name="account_settings_servers">"Impostazioni server"</string>
-    <string name="account_delete_dlg_title">"Rimuovi"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" verrà rimosso da Email."</string>
     <string name="provider_note_yahoo">"Accesso alla casella di posta non supportato per alcuni tipi di account di posta Yahoo!. Se hai problemi di connessione, visita il sito yahoo.com per ulteriori informazioni."</string>
     <string name="provider_note_yahoo_uk">"Prima di impostare questo account email, visita il sito web Yahoo! e attiva l\'accesso email POP3 per questo account."</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-ja/build_number.xml b/res/values-ja/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-ja/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 09a58c00d..40ae3f84b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"メールの着信をバイブレーションでも知らせる"</string>
     <string name="account_settings_ringtone">"着信音を選択"</string>
     <string name="account_settings_servers">"サーバーの設定"</string>
-    <string name="account_delete_dlg_title">"削除"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」をメールから削除します。"</string>
     <string name="provider_note_yahoo">"一部のタイプの Yahoo! メール アカウントでは、受信トレイへのアクセスがサポートされていません。接続できない場合は yahoo.com にアクセスして詳細をご確認ください。"</string>
     <string name="provider_note_yahoo_uk">"このメールアカウントを設定する前に、Yahoo!サイトでこのアカウントのPOP3メールアクセスを有効にしてください。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 000000000..67ba29d11
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="read_attachment_label">"이메일 첨부파일 읽기"</string>
+    <string name="read_attachment_desc">"이 응용프로그램으로 이메일 첨부파일을 읽을 수 있습니다."</string>
+    <string name="app_name">"이메일"</string>
+    <string name="accounts_title">"사용자 계정"</string>
+    <string name="compose_title">"편지쓰기"</string>
+    <string name="debug_title">"디버그"</string>
+    <string name="next_action">"다음"</string>
+    <string name="okay_action">"확인"</string>
+    <string name="cancel_action">"취소"</string>
+    <string name="send_action">"보내기"</string>
+    <string name="reply_action">"답장"</string>
+    <string name="reply_all_action">"전체답장"</string>
+    <string name="delete_action">"삭제"</string>
+    <string name="forward_action">"전달"</string>
+    <string name="done_action">"완료"</string>
+    <string name="discard_action">"삭제"</string>
+    <string name="save_draft_action">"임시 저장"</string>
+    <string name="refresh_action">"새로고침"</string>
+    <string name="add_account_action">"계정 추가"</string>
+    <string name="compose_action">"편지쓰기"</string>
+    <string name="search_action">"검색"</string>
+    <string name="open_action">"열기"</string>
+    <string name="account_settings_action">"계정 설정"</string>
+    <string name="remove_account_action">"계정 삭제"</string>
+    <string name="accounts_action">"계정"</string>
+    <string name="mark_as_read_action">"읽은 상태로 표시"</string>
+    <string name="mark_as_unread_action">"읽지않은 상태로 표시"</string>
+    <string name="add_cc_bcc_action">"참조 및 숨은참조 추가"</string>
+    <string name="add_attachment_action">"첨부파일 추가"</string>
+    <string name="dump_settings_action">"덤프 설정"</string>
+    <string name="accounts_context_menu_title">"계정 옵션"</string>
+    <string name="status_loading_more">"메일 로드 중..."</string>
+    <string name="status_network_error">"연결 오류"</string>
+    <string name="status_loading_more_failed">"추가 메일 로드 재시도"</string>
+    <string name="notification_new_title">"새 이메일"</string>
+    <string name="notification_new_one_account_fmt">"읽지않은 메일 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
+    <string name="notification_new_multi_account_fmt">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</string>
+    <string name="special_mailbox_name_inbox">"받은편지함"</string>
+    <string name="accounts_welcome">"이메일 설정에 오신 것을 환영합니다."\n\n"원하는 이메일 계정을 사용하세요."\n\n"가장 많이 사용하는 이메일 계정은 2단계 만에 설정할 수 있습니다."</string>
+    <string name="debug_version_fmt">"버전: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="debug_enable_debug_logging_label">"별도의 디버그 로깅 사용 여부"</string>
+    <string name="debug_enable_sensitive_logging_label">"디버그 로깅 시 중요 정보 표시 여부(로그에 비밀번호가 표시될 수 있음)"</string>
+    <string name="message_list_load_more_messages_action">"추가 메일 로드"</string>
+    <string name="message_compose_to_hint">"받는사람"</string>
+    <string name="message_compose_cc_hint">"참조"</string>
+    <string name="message_compose_bcc_hint">"숨은참조"</string>
+    <string name="message_compose_subject_hint">"제목"</string>
+    <string name="message_compose_fwd_header_fmt">\n\n"-------- 원본 메일 --------"\n"제목: <xliff:g id="SUBJECT">%s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%s</xliff:g>"\n"받는사람: <xliff:g id="TO">%s</xliff:g>"\n"참조: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
+    <string name="message_compose_quoted_text_label">"받은메일"</string>
+    <string name="message_compose_error_no_recipients">"받는 사람을 한 명 이상 추가해야 합니다."</string>
+    <string name="message_compose_attachments_skipped_toast">"일부 첨부파일이 다운로드되지 않아 전달할 수 없습니다."</string>
+    <string name="message_view_to_label">"받는사람:"</string>
+    <string name="message_view_cc_label">"참조:"</string>
+    <string name="message_view_attachment_view_action">"열기"</string>
+    <string name="message_view_attachment_download_action">"저장"</string>
+    <string name="message_view_prev_action">"이전 메일"</string>
+    <string name="message_view_next_action">"다음 메일"</string>
+    <string name="message_view_status_attachment_saved">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)이 SD 카드에 저장되었습니다."</string>
+    <string name="message_view_status_attachment_not_saved">"SD 카드에 첨부파일을 저장할 수 없습니다."</string>
+    <string name="message_view_show_pictures_instructions">"삽입된 사진을 표시하려면 \'사진 표시\'를 선택하세요."</string>
+    <string name="message_view_show_pictures_action">"사진 표시"</string>
+    <string name="message_view_fetching_attachment_toast">"첨부파일을 가져오는 중입니다."</string>
+    <string name="message_deleted_toast">"메일이 삭제되었습니다."</string>
+    <string name="message_discarded_toast">"메일이 삭제되었습니다."</string>
+    <string name="message_saved_toast">"메일을 임시로 저장했습니다."</string>
+    <string name="account_setup_basics_title">"이메일 설정"</string>
+    <string name="account_setup_basics_instructions">"계정 이메일 주소 입력:"</string>
+    <string name="account_setup_basics_email_hint">"이메일 주소"</string>
+    <string name="account_setup_basics_password_hint">"비밀번호"</string>
+    <string name="account_setup_basics_default_label">"기본적으로 이 계정에서 이메일 전송"</string>
+    <string name="account_setup_basics_manual_setup_action">"수동 설정"</string>
+    <string name="account_setup_username_password_toast">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
+    <string name="account_setup_check_settings_retr_info_msg">"계정 정보 검색 중..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg">"받는 서버 설정 확인 중..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">"보내는 서버 설정 확인 중..."</string>
+    <string name="account_setup_check_settings_canceling_msg">"취소하는 중..."</string>
+    <string name="account_setup_names_title">"이메일 설정"</string>
+    <string name="account_setup_names_instructions">"계정이 설정되었으며 이메일이 작동됩니다."</string>
+    <string name="account_setup_names_account_name_label">"계정 이름 입력(선택사항)"</string>
+    <string name="account_setup_names_user_name_label">"발신 메일에 표시할 이름"</string>
+    <string name="account_setup_account_type_title">"새 이메일 계정 추가"</string>
+    <string name="account_setup_account_type_instructions">"계정 유형"</string>
+    <string name="account_setup_account_type_pop_action">"POP3 계정"</string>
+    <string name="account_setup_account_type_imap_action">"IMAP 계정"</string>
+    <string name="account_setup_incoming_title">"받는 서버 설정"</string>
+    <string name="account_setup_incoming_username_label">"사용자 이름"</string>
+    <string name="account_setup_incoming_password_label">"비밀번호"</string>
+    <string name="account_setup_incoming_pop_server_label">"POP3 서버"</string>
+    <string name="account_setup_incoming_imap_server_label">"IMAP 서버"</string>
+    <string name="account_setup_incoming_port_label">"포트"</string>
+    <string name="account_setup_incoming_security_label">"보안 유형"</string>
+    <string name="account_setup_incoming_security_none_label">"없음"</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">"SSL(제공되는 경우)"</string>
+    <string name="account_setup_incoming_security_ssl_label">"SSL(항상)"</string>
+    <string name="account_setup_incoming_security_tls_optional_label">"TLS(제공되는 경우)"</string>
+    <string name="account_setup_incoming_security_tls_label">"TLS(항상)"</string>
+    <string name="account_setup_incoming_delete_policy_label">"서버에서 이메일 삭제"</string>
+    <string name="account_setup_incoming_delete_policy_never_label">"삭제 안함"</string>
+    <string name="account_setup_incoming_delete_policy_7days_label">"7일 후"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">"받은편지함에서 삭제할 때"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label">"IMAP 경로 접두어(prefix)"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint">"선택사항"</string>
+    <string name="account_setup_outgoing_title">"보내는 서버 설정"</string>
+    <string name="account_setup_outgoing_smtp_server_label">"SMTP 서버"</string>
+    <string name="account_setup_outgoing_port_label">"포트"</string>
+    <string name="account_setup_outgoing_security_label">"보안 유형"</string>
+    <string name="account_setup_outgoing_require_login_label">"로그인해야 함"</string>
+    <string name="account_setup_outgoing_username_label">"사용자 이름"</string>
+    <string name="account_setup_outgoing_password_label">"비밀번호"</string>
+    <string name="account_setup_options_title">"계정 옵션"</string>
+    <string name="account_setup_options_mail_check_frequency_label">"이메일 확인 빈도"</string>
+    <string name="account_setup_options_mail_check_frequency_never">"안함"</string>
+    <string name="account_setup_options_mail_check_frequency_5min">"5분마다"</string>
+    <string name="account_setup_options_mail_check_frequency_10min">"10분마다"</string>
+    <string name="account_setup_options_mail_check_frequency_15min">"15분마다"</string>
+    <string name="account_setup_options_mail_check_frequency_30min">"30분마다"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">"1시간마다"</string>
+    <string name="account_setup_options_default_label">"기본적으로 이 계정에서 이메일 전송"</string>
+    <string name="account_setup_options_notify_label">"이메일 도착 시 알림"</string>
+    <string name="account_setup_failed_dlg_title">"설정을 완료할 수 없음"</string>
+    <string name="account_setup_failed_dlg_auth_message">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">"잘못된 사용자 이름 또는 비밀번호"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message">"서버에 안전하게 연결할 수 없습니다."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt">"서버에 안전하게 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_server_message">"서버에 연결할 수 없습니다."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt">"서버에 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required">"TLS가 필요하지만 서버에서 지원하지 않습니다."</string>
+    <string name="account_setup_failed_auth_required">"인증 방법이 서버에서 지원되지 않습니다."</string>
+    <string name="account_setup_failed_security">"보안 오류로 서버에 연결할 수 없습니다."</string>
+    <string name="account_setup_failed_ioerror">"서버에 연결할 수 없습니다."</string>
+    <string name="account_setup_failed_dlg_edit_details_action">"세부정보 수정"</string>
+    <string name="account_settings_title_fmt">"기본설정"</string>
+    <string name="account_settings_default_label">"기본 계정"</string>
+    <string name="account_settings_default_summary">"기본적으로 이 계정에서 이메일 전송"</string>
+    <string name="account_settings_notify_label">"이메일 알림"</string>
+    <string name="account_settings_notify_summary">"이메일 도착 시 상태 표시줄에서 알림"</string>
+    <string name="account_settings_mail_check_frequency_label">"이메일 확인 빈도"</string>
+    <string name="account_settings_incoming_label">"수신 설정"</string>
+    <string name="account_settings_outgoing_label">"발신 설정"</string>
+    <string name="account_settings_add_account_label">"다른 계정 추가"</string>
+    <string name="account_settings_description_label">"계정 이름"</string>
+    <string name="account_settings_name_label">"이름"</string>
+    <string name="account_settings_notifications">"알림 설정"</string>
+    <string name="account_settings_vibrate_enable">"진동"</string>
+    <string name="account_settings_vibrate_summary">"이메일 도착 시 진동"</string>
+    <string name="account_settings_ringtone">"벨소리 선택"</string>
+    <string name="account_settings_servers">"서버 설정"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
+    <string name="account_delete_dlg_instructions_fmt">"계정(<xliff:g id="ACCOUNT">%s</xliff:g>)이 이메일에서 삭제됩니다."</string>
+    <string name="provider_note_yahoo">"일부 Yahoo! 메일 계정의 경우 편지함에 액세스할 수 없습니다. 접속에 문제가 있을 경우 자세한 정보는 yahoo.com을 참조하세요."</string>
+    <string name="provider_note_yahoo_uk">"이메일 계정을 설정하기 전에 Yahoo! 웹사이트를 방문하여 이 계정에 대한 POP3 이메일 액세스를 사용 설정하세요."</string>
+    <string name="provider_note_live">"일부 \'Plus\' 계정에만 이 프로그램을 연결할 수 있는 POP 액세스 권한이 있습니다. 올바른 이메일 주소와 비밀번호를 입력해도 로그인이 되지 않으면 \'Plus\' 계정 사용료가 미납되었을 수 있습니다. 이러한 메일 계정에 액세스하려면 웹브라우저를 실행하세요."</string>
+    <string name="provider_note_t_online">"이메일 계정을 설정하기 전에 T-Online 웹사이트를 방문하여 POP3 이메일 액세스에 대한 비밀번호를 만드세요."</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100644
index 000000000..652b35284
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="read_attachment_label">"lese e-post-vedlegg"</string>
+    <string name="read_attachment_desc">"Tillat applikasjonen å lese e-post-vedleggene dine."</string>
+    <string name="app_name">"E-post"</string>
+    <string name="accounts_title">"Dine kontoer"</string>
+    <string name="compose_title">"Skriv e-post"</string>
+    <string name="debug_title">"Debug"</string>
+    <string name="next_action">"Neste"</string>
+    <string name="okay_action">"OK"</string>
+    <string name="cancel_action">"Avbryt"</string>
+    <string name="send_action">"Send"</string>
+    <string name="reply_action">"Svar"</string>
+    <string name="reply_all_action">"Svar alle"</string>
+    <string name="delete_action">"Slett"</string>
+    <string name="forward_action">"Videresend"</string>
+    <string name="done_action">"Ferdig"</string>
+    <string name="discard_action">"Forkast"</string>
+    <string name="save_draft_action">"Lagre som utkast"</string>
+    <string name="refresh_action">"Oppdater"</string>
+    <string name="add_account_action">"Legg til konto"</string>
+    <string name="compose_action">"Skriv e-post"</string>
+    <string name="search_action">"Søk"</string>
+    <string name="open_action">"Åpne"</string>
+    <string name="account_settings_action">"Kontoinnstillinger"</string>
+    <string name="remove_account_action">"Fjern konto"</string>
+    <string name="accounts_action">"Kontoer"</string>
+    <string name="mark_as_read_action">"Merk som lest"</string>
+    <string name="mark_as_unread_action">"Merk som ulest"</string>
+    <string name="add_cc_bcc_action">"Legg til kopi/blindkopi"</string>
+    <string name="add_attachment_action">"Legg til vedlegg"</string>
+    <string name="dump_settings_action">"Dump settings"</string>
+    <string name="accounts_context_menu_title">"Kontoinnstillinger"</string>
+    <string name="status_loading_more">"Henter meldinger…"</string>
+    <string name="status_network_error">"Feil ved tilkobling"</string>
+    <string name="status_loading_more_failed">"Prøv på nytt å hente flere meldinger"</string>
+    <string name="notification_new_title">"Ny e-post"</string>
+    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulest(e) (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
+    <string name="notification_new_multi_account_fmt">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</string>
+    <string name="special_mailbox_name_inbox">"Innboks"</string>
+    <string name="accounts_welcome">"Velkommen til e-post-oppsettet!"\n\n"Du kan bruke hvilken som helst e-postkonto."\n\n"De fleste vanlige e-postkontoer kan settes opp i to trinn!"</string>
+    <string name="debug_version_fmt">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="debug_enable_debug_logging_label">"Enable extra debug logging?"</string>
+    <string name="debug_enable_sensitive_logging_label">"Enable sensitive information debug logging? (May show passwords in logs.)"</string>
+    <string name="message_list_load_more_messages_action">"Hent flere meldinger"</string>
+    <string name="message_compose_to_hint">"Til"</string>
+    <string name="message_compose_cc_hint">"Kopi"</string>
+    <string name="message_compose_bcc_hint">"Blindkopi"</string>
+    <string name="message_compose_subject_hint">"Emne"</string>
+    <string name="message_compose_fwd_header_fmt">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
+    <string name="message_compose_quoted_text_label">"Sitert tekst"</string>
+    <string name="message_compose_error_no_recipients">"Du må legge til minst én mottager."</string>
+    <string name="message_compose_attachments_skipped_toast">"Noen vedlegg kunne ikke sendes videre fordi de ikke er blitt lastet ned."</string>
+    <string name="message_view_to_label">"Til:"</string>
+    <string name="message_view_cc_label">"Kopi:"</string>
+    <string name="message_view_attachment_view_action">"Åpne"</string>
+    <string name="message_view_attachment_download_action">"Lagre"</string>
+    <string name="message_view_prev_action">"Forrige melding"</string>
+    <string name="message_view_next_action">"Neste melding"</string>
+    <string name="message_view_status_attachment_saved">"Vedlegget ble lagret til minnekortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved">"Kunne ikke lagre vedlegget til minnekort."</string>
+    <string name="message_view_show_pictures_instructions">"Velg \\\"Vis bilder\\\" for å vise vedlagte bilder."</string>
+    <string name="message_view_show_pictures_action">"Vis bilder"</string>
+    <string name="message_view_fetching_attachment_toast">"Henter vedlegg."</string>
+    <string name="message_deleted_toast">"Meldingen ble slettet."</string>
+    <string name="message_discarded_toast">"Meldingen ble forkastet."</string>
+    <string name="message_saved_toast">"Meldingen ble lagret som utkast."</string>
+    <string name="account_setup_basics_title">"Sett opp e-post"</string>
+    <string name="account_setup_basics_instructions">"Skriv e-postadressen til kontoen din:"</string>
+    <string name="account_setup_basics_email_hint">"E-postadresse"</string>
+    <string name="account_setup_basics_password_hint">"Passord"</string>
+    <string name="account_setup_basics_default_label">"Bruk denne kontoen som standard for utgående e-post."</string>
+    <string name="account_setup_basics_manual_setup_action">"Manuelt oppsett"</string>
+    <string name="account_setup_username_password_toast">"Skriv inn en gyldig e-postadresse og passord."</string>
+    <string name="account_setup_check_settings_retr_info_msg">"Henter kontoinformasjon…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
+    <string name="account_setup_check_settings_canceling_msg">"Avbryter…"</string>
+    <string name="account_setup_names_title">"Sett opp e-post"</string>
+    <string name="account_setup_names_instructions">"Kontoen er satt opp, og e-post er på vei!"</string>
+    <string name="account_setup_names_account_name_label">"Gi denne kontoen et navn (valgfritt)"</string>
+    <string name="account_setup_names_user_name_label">"Navnet ditt (vises i utgående meldinger)"</string>
+    <string name="account_setup_account_type_title">"Legg til ny e-postkonto"</string>
+    <string name="account_setup_account_type_instructions">"Hva slags konto er dette?"</string>
+    <string name="account_setup_account_type_pop_action">"POP3-konto"</string>
+    <string name="account_setup_account_type_imap_action">"IMAP-konto"</string>
+    <string name="account_setup_incoming_title">"Tjenerinnstillinger for inngående e-post"</string>
+    <string name="account_setup_incoming_username_label">"Brukernavn"</string>
+    <string name="account_setup_incoming_password_label">"Passord"</string>
+    <string name="account_setup_incoming_pop_server_label">"POP3-tjener"</string>
+    <string name="account_setup_incoming_imap_server_label">"IMAP-tjener"</string>
+    <string name="account_setup_incoming_port_label">"Port"</string>
+    <string name="account_setup_incoming_security_label">"Sikkerhetstype"</string>
+    <string name="account_setup_incoming_security_none_label">"Ingen"</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">"SSL (hvis tilgjengelig)"</string>
+    <string name="account_setup_incoming_security_ssl_label">"SSL (alltid)"</string>
+    <string name="account_setup_incoming_security_tls_optional_label">"TLS (hvis tilgjengelig)"</string>
+    <string name="account_setup_incoming_security_tls_label">"TLS (alltid)"</string>
+    <string name="account_setup_incoming_delete_policy_label">"Slett e-post fra tjener"</string>
+    <string name="account_setup_incoming_delete_policy_never_label">"Aldri"</string>
+    <string name="account_setup_incoming_delete_policy_7days_label">"Etter en uke"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">"Når jeg sletter den fra innboksen"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label">"IMAP-stiprefiks"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint">"Valgfritt"</string>
+    <string name="account_setup_outgoing_title">"Tjenerinnstillinger for utgående e-post"</string>
+    <string name="account_setup_outgoing_smtp_server_label">"SMTP-tjener"</string>
+    <string name="account_setup_outgoing_port_label">"Port"</string>
+    <string name="account_setup_outgoing_security_label">"Sikkerhetstype"</string>
+    <string name="account_setup_outgoing_require_login_label">"Krev innlogging."</string>
+    <string name="account_setup_outgoing_username_label">"Brukernavn"</string>
+    <string name="account_setup_outgoing_password_label">"Passord"</string>
+    <string name="account_setup_options_title">"Kontoinnstillinger"</string>
+    <string name="account_setup_options_mail_check_frequency_label">"Hvor ofte e-post skal sjekkes"</string>
+    <string name="account_setup_options_mail_check_frequency_never">"Aldri"</string>
+    <string name="account_setup_options_mail_check_frequency_5min">"Hvert 5. minutt"</string>
+    <string name="account_setup_options_mail_check_frequency_10min">"Hvert 10. minutt"</string>
+    <string name="account_setup_options_mail_check_frequency_15min">"Hvert 15. minutt"</string>
+    <string name="account_setup_options_mail_check_frequency_30min">"Hvert 30. minutt"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">"Hver time"</string>
+    <string name="account_setup_options_default_label">"Bruk denne kontoen som standard for utgående e-post."</string>
+    <string name="account_setup_options_notify_label">"Varsle når det kommer e-post."</string>
+    <string name="account_setup_failed_dlg_title">"Kunne ikke fullføre oppsettet"</string>
+    <string name="account_setup_failed_dlg_auth_message">"Feil brukernavn eller passord."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">"Feil brukernavn eller passord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message">"Kan ikke åpne en sikker tilkobling til tjeneren."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt">"Kan ikke åpne en sikker tilkobling til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_server_message">"Kan ikke koble til tjeneren."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt">"Kan ikke koble til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required">"TLS påkrevd, men tjeneren støtter det ikke."</string>
+    <string name="account_setup_failed_auth_required">"Tjeneren støtter ikke de påkrevde autentiseringsmetodene."</string>
+    <string name="account_setup_failed_security">"Kunne ikke koble til tjeneren på grunn av sikkerhetsfeil."</string>
+    <string name="account_setup_failed_ioerror">"Kunne ikke koble til tjeneren."</string>
+    <string name="account_setup_failed_dlg_edit_details_action">"Rediger detaljer"</string>
+    <string name="account_settings_title_fmt">"Generelle innstillinger"</string>
+    <string name="account_settings_default_label">"Standardkonto"</string>
+    <string name="account_settings_default_summary">"Bruk denne kontoen som standard for utgående e-post."</string>
+    <string name="account_settings_notify_label">"Varsling om e-post"</string>
+    <string name="account_settings_notify_summary">"Varsle i statusfeltet når det kommer e-post"</string>
+    <string name="account_settings_mail_check_frequency_label">"Hvor ofte det skal sjekkes etter e-post"</string>
+    <string name="account_settings_incoming_label">"Inngående innstillinger"</string>
+    <string name="account_settings_outgoing_label">"Utgående innstillinger"</string>
+    <string name="account_settings_add_account_label">"Legg til en annen konto"</string>
+    <string name="account_settings_description_label">"Kontonavn"</string>
+    <string name="account_settings_name_label">"Ditt navn"</string>
+    <string name="account_settings_notifications">"Innstillinger for varsling"</string>
+    <string name="account_settings_vibrate_enable">"Vibrer"</string>
+    <string name="account_settings_vibrate_summary">"Vibrer når det kommer e-post"</string>
+    <string name="account_settings_ringtone">"Velg ringetone"</string>
+    <string name="account_settings_servers">"Innstillinger for tjener"</string>
+    <string name="account_delete_dlg_title">"Fjern"</string>
+    <string name="account_delete_dlg_instructions_fmt">"Kontoen \\\"<xliff:g id="ACCOUNT">%s</xliff:g>\\\" vil bli fjernet fra e-postapplikasjonen."</string>
+    <string name="provider_note_yahoo">"E-posttilgang er ikke støttet for enkelte typer Yahoo!-e-postkontoer. Hvis du har problemer med å koble til, besøk yahoo.com for mer informasjon."</string>
+    <string name="provider_note_yahoo_uk">"Før du setter opp denne e-postkontoen, må du gå til Yahoo!-nettsiden og slå på POP3-tilgang for den."</string>
+    <string name="provider_note_live">"Bare noen \\\"pluss-kontoer tilbyr POP-tilgangBREAK_0        som dette programmet trenger for å koble til. Hvis du ikke klarer å logge innBREAK_1        med riktig e-postadresse og passord, kan det være du ikke har en betaltBREAK_2        \\\"pluss-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
+    <string name="provider_note_t_online">"Før du setter opp denne e-postkontoen, besøk T-Online-nettsiden og velg et passord for e-posttilgang via POP3."</string>
+</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-nl/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-nl/build_number.xml b/res/values-nl/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-nl/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 175151f49..581b7a637 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Ook trillen bij ontvangst van e-mail"</string>
     <string name="account_settings_ringtone">"Beltoon selecteren"</string>
     <string name="account_settings_servers">"Serverinstellingen"</string>
-    <string name="account_delete_dlg_title">"Verwijderen"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
     <string name="provider_note_yahoo">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, ga je naar yahoo.com voor meer informatie."</string>
     <string name="provider_note_yahoo_uk">"Ga voordat je deze e-mailaccount instelt naar de website van Yahoo! en schakel toegang met POP3 in voor deze account."</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-pl/build_number.xml b/res/values-pl/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-pl/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a275c3d00..cb5022d87 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -95,7 +95,7 @@
     <string name="account_setup_names_title">"Konfiguracja konta e-mail"</string>
     <string name="account_setup_names_instructions">"Konto zostało skonfigurowane, a wiadomości e-mail są w drodze!"</string>
     <string name="account_setup_names_account_name_label">"Nazwa konta (opcjonalnie)"</string>
-    <string name="account_setup_names_user_name_label">"Imię i nazwisko (wyświetlane w wiadomościach wychodzących)"</string>
+    <string name="account_setup_names_user_name_label">"Twoje nazwisko (wyświetlane w wiadomościach wychodzących)"</string>
     <string name="account_setup_account_type_title">"Dodaj nowe konto e-mail"</string>
     <string name="account_setup_account_type_instructions">"Jakiego typu jest to konto?"</string>
     <string name="account_setup_account_type_pop_action">"Konto POP3"</string>
@@ -144,7 +144,7 @@
     <string name="account_setup_failed_dlg_server_message_fmt">"Nie można nawiązać połączenia z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required">"Wymagane połączenie TLS nie jest obsługiwane przez serwer."</string>
     <string name="account_setup_failed_auth_required">"Serwer nie obsługuje metod uwierzytelniania."</string>
-    <string name="account_setup_failed_security">"Nie można nawiązać połączenia z serwerem z powodu wystąpienia błędu zabezpieczeń."</string>
+    <string name="account_setup_failed_security">"Nie można nawiązać połączenia z serwerem z powodu błędu zabezpieczeń."</string>
     <string name="account_setup_failed_ioerror">"Nie można nawiązać połączenia z serwerem."</string>
     <string name="account_setup_failed_dlg_edit_details_action">"Edytuj szczegóły"</string>
     <string name="account_settings_title_fmt">"Ustawienia ogólne"</string>
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Sygnalizuj wibracjami otrzymanie wiadomości e-mail"</string>
     <string name="account_settings_ringtone">"Wybierz dzwonek"</string>
     <string name="account_settings_servers">"Ustawienia serwera"</string>
-    <string name="account_delete_dlg_title">"Usuń"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> zostanie usunięte z usługi poczty e-mail."</string>
     <string name="provider_note_yahoo">"Dostęp do skrzynki pocztowej nie jest obsługiwany w przypadku kilku typów kont pocztowych w usłudze Yahoo! Jeśli podczas nawiązywania połączenia występują problemy, odwiedź witrynę yahoo.com w celu uzyskania dodatkowych informacji."</string>
     <string name="provider_note_yahoo_uk">"Przed skonfigurowaniem tego konta e-mail odwiedź witrynę usługi Yahoo! i włącz dostęp do poczty POP3."</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-ru/build_number.xml b/res/values-ru/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-ru/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a96a70586..76dc34e00 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,7 +87,7 @@
     <string name="account_setup_basics_password_hint">"Пароль"</string>
     <string name="account_setup_basics_default_label">"По умолчанию отправлять почту с данного аккаунта."</string>
     <string name="account_setup_basics_manual_setup_action">"Ручная настройка"</string>
-    <string name="account_setup_username_password_toast">"Укажите правильный адрес электронной почты и пароль."</string>
+    <string name="account_setup_username_password_toast">"Укажите правильные адрес электронной почты и пароль."</string>
     <string name="account_setup_check_settings_retr_info_msg">"Получение информации об аккаунте..."</string>
     <string name="account_setup_check_settings_check_incoming_msg">"Проверка настроек сервера входящей почты..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg">"Проверка настроек сервера исходящей почты..."</string>
@@ -95,7 +95,7 @@
     <string name="account_setup_names_title">"Настройка электронной почты"</string>
     <string name="account_setup_names_instructions">"Ваш аккаунт настроен, электронная почта работает."</string>
     <string name="account_setup_names_account_name_label">"Указать название этого аккаунта (необязательно)"</string>
-    <string name="account_setup_names_user_name_label">"Ваше имя (будет показано в исходящих письмах)"</string>
+    <string name="account_setup_names_user_name_label">"Ваше имя (отображается в исходящих письмах)"</string>
     <string name="account_setup_account_type_title">"Добавить новый аккаунт электронной почты"</string>
     <string name="account_setup_account_type_instructions">"К какому типу принадлежит этот аккаунт?"</string>
     <string name="account_setup_account_type_pop_action">"Аккаунт POP3"</string>
@@ -143,7 +143,7 @@
     <string name="account_setup_failed_dlg_server_message">"Не удается подключиться к серверу."</string>
     <string name="account_setup_failed_dlg_server_message_fmt">"Не удается подключиться к серверу."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required">"TLS требуется, но не поддерживается сервером."</string>
-    <string name="account_setup_failed_auth_required">"Методы проверки подлинности не поддерживаются сервером."</string>
+    <string name="account_setup_failed_auth_required">"Сервер не поддерживает методы аутентификации."</string>
     <string name="account_setup_failed_security">"Не удается установить соединение с сервером из-за ошибки безопасности."</string>
     <string name="account_setup_failed_ioerror">"Не удается установить соединение с сервером."</string>
     <string name="account_setup_failed_dlg_edit_details_action">"Изменить подробную информацию"</string>
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"Также включить вибрацию при получении почты"</string>
     <string name="account_settings_ringtone">"Выбрать мелодию"</string>
     <string name="account_settings_servers">"Настройки сервера"</string>
-    <string name="account_delete_dlg_title">"Удалить"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" будет удален из системы электронной почты."</string>
     <string name="provider_note_yahoo">"Доступ к почтовому ящику для некоторых типов почтовых аккаунтов Yahoo! не поддерживается. Если при подключении возникли проблемы, см. дополнительные сведения на yahoo.com."</string>
     <string name="provider_note_yahoo_uk">"Чтобы настроить этот аккаунт электронной почты, перейдите на веб-сайт Yahoo! и включите для этого аккаунта доступ по протоколу POP3."</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-zh-rCN/build_number.xml b/res/values-zh-rCN/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-zh-rCN/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 17cd2fd1c..33d06eef9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"收到电子邮件时发出振动"</string>
     <string name="account_settings_ringtone">"选择铃声"</string>
     <string name="account_settings_servers">"服务器设置"</string>
-    <string name="account_delete_dlg_title">"删除"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”将从电子邮件中删除。"</string>
     <string name="provider_note_yahoo">"某些类型的 Yahoo! 邮件帐户不支持邮箱访问。如果您在连接时遇到问题，请访问 yahoo.com 了解更多信息。"</string>
     <string name="provider_note_yahoo_uk">"在设置此电子邮件帐户之前，请访问 Yahoo! 网站，并为此帐户启用 POP3 电子邮件服务。"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index 1d337a8ec..000000000
--- a/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-  <string-array name="account_settings_check_frequency_values">
-    <item>"-1"</item>
-    <item>"5"</item>
-    <item>"10"</item>
-    <item>"15"</item>
-    <item>"30"</item>
-    <item>"60"</item>
-  </string-array>
-</resources>
diff --git a/res/values-zh-rTW/build_number.xml b/res/values-zh-rTW/build_number.xml
deleted file mode 100644
index 4be95dcab..000000000
--- a/res/values-zh-rTW/build_number.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_number">"20080722-0001"</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9f3ff7326..415429c20 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -144,7 +144,7 @@
     <string name="account_setup_failed_dlg_server_message_fmt">"無法連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required">"必須使用 TLS，但此伺服器不支援。"</string>
     <string name="account_setup_failed_auth_required">"伺服器不支援這些驗證方法。"</string>
-    <string name="account_setup_failed_security">"無法連線至伺服器，因為發生安全性錯誤。"</string>
+    <string name="account_setup_failed_security">"發生安全性錯誤，無法連線至伺服器。"</string>
     <string name="account_setup_failed_ioerror">"無法連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_edit_details_action">"編輯詳細資訊"</string>
     <string name="account_settings_title_fmt">"一般設定"</string>
@@ -163,7 +163,8 @@
     <string name="account_settings_vibrate_summary">"收到電子郵件時也振動"</string>
     <string name="account_settings_ringtone">"選取鈴聲"</string>
     <string name="account_settings_servers">"伺服器設定"</string>
-    <string name="account_delete_dlg_title">"移除"</string>
+    <!-- no translation found for account_delete_dlg_title (6806087520856396608) -->
+    <skip />
     <string name="account_delete_dlg_instructions_fmt">"系統將從 [電子郵件] 中移除帳戶「<xliff:g id="ACCOUNT">%s</xliff:g>」。"</string>
     <string name="provider_note_yahoo">"不支援某些類型的 Yahoo! 郵件帳戶信箱。如果您無法順利連線，請造訪 yahoo.com 以取得詳細資訊。"</string>
     <string name="provider_note_yahoo_uk">"在設定此電子郵件帳戶前，請先造訪 Yahoo! 網站，並啟用這個帳戶的 POP3 電子郵件收發功能。"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b93612329..cdf14b159 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -30,7 +30,7 @@
         <item>@string/account_setup_options_mail_check_frequency_1hour</item>
     </string-array>
 
-    <string-array name="account_settings_check_frequency_values">
+    <string-array name="account_settings_check_frequency_values" translatable="false">
         <item>-1</item>
         <item>5</item>
         <item>10</item>
diff --git a/res/values/build_number.xml b/res/values/build_number.xml
index d5ca53feb..9c414d2a2 100644
--- a/res/values/build_number.xml
+++ b/res/values/build_number.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-	<string name="build_number">20080722-0001</string>
+	<string name="build_number" translatable="false">20080722-0001</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c7086b85..d57727d11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -344,7 +344,7 @@
     <!-- On Settings screen, section heading -->
     <string name="account_settings_servers">Server settings</string>
     <!-- Title of Remove account confirmation dialog box -->
-    <string name="account_delete_dlg_title">Remove</string>
+    <string name="account_delete_dlg_title">Remove account</string>
     <!-- Message of Remove account confirmation dialog box -->
     <string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from Email.</string>
 
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index c97afa3a8..21fc17bc8 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -244,20 +244,20 @@
 
     <!-- Poland -->
     <provider id="onet" label="Onet.pl" domain="poczta.onet.pl">
-        <incoming uri="pop3://pop3.poczta.onet.pl:110" username="$email" />
-        <outgoing uri="smtp://smtp.poczta.onet.pl:25" username="$email" />
+        <incoming uri="pop3://pop3.poczta.onet.pl" username="$email" />
+        <outgoing uri="smtp://smtp.poczta.onet.pl" username="$email" />
     </provider>
     <provider id="wirtualna" label="Wirtualna Polska" domain="wp.pl">
-        <incoming uri="pop3://pop3.wp.pl:110" username="$user" />
-        <outgoing uri="smtp://smtp.wp.pl:25" username="$user" />
+        <incoming uri="pop3://pop3.wp.pl" username="$user" />
+        <outgoing uri="smtp://smtp.wp.pl" username="$user" />
     </provider>
     <provider id="interia" label="Interia" domain="interia.pl">
-        <incoming uri="pop3+ssl://poczta.interia.pl:995" username="$user" />
-        <outgoing uri="smtp+ssl://poczta.interia.pl:25" username="$user" />
+        <incoming uri="pop3+ssl://poczta.interia.pl" username="$user" />
+        <outgoing uri="smtp+ssl://poczta.interia.pl" username="$user" />
     </provider>
     <provider id="o2" label="O2" domain="o2.pl">
-        <incoming uri="pop3+ssl://poczta.o2.pl:995" username="$user" />
-        <outgoing uri="smtp+ssl://poczta.o2.pl:25" username="$user" />
+        <incoming uri="pop3+ssl://poczta.o2.pl" username="$user" />
+        <outgoing uri="smtp+ssl://poczta.o2.pl" username="$user" />
     </provider>
 
 </providers>
diff --git a/src/com/android/email/activity/Accounts.java b/src/com/android/email/activity/Accounts.java
index ad284ea95..c2c6521de 100644
--- a/src/com/android/email/activity/Accounts.java
+++ b/src/com/android/email/activity/Accounts.java
@@ -163,6 +163,7 @@ public class Accounts extends ListActivity implements OnItemClickListener, OnCli
 
     private Dialog createRemoveAccountDialog() {
         return new AlertDialog.Builder(this)
+            .setIcon(android.R.drawable.ic_dialog_alert)
             .setTitle(R.string.account_delete_dlg_title)
             .setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
                     mSelectedContextAccount.getDescription()))
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 27590c29f..c0a10b6a0 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -17,8 +17,11 @@
 package com.android.email.activity;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -352,65 +355,27 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         Intent intent = getIntent();
 
         String action = intent.getAction();
-
-        if (Intent.ACTION_VIEW.equals(action) || Intent.ACTION_SENDTO.equals(action)) {
-            /*
-             * Someone has clicked a mailto: link. The address is in the URI.
-             */
+        
+        // Handle the various intents that launch the message composer
+        if (Intent.ACTION_VIEW.equals(action) || Intent.ACTION_SENDTO.equals(action) ||
+                (Intent.ACTION_SEND.equals(action))) {
+            
+            // Check first for a valid account
             mAccount = Preferences.getPreferences(this).getDefaultAccount();
             if (mAccount == null) {
-                /*
-                 * There are no accounts set up. This should not have happened. Prompt the
-                 * user to set up an account as an acceptable bailout.
-                 */
+                // There are no accounts set up. This should not have happened. Prompt the
+                // user to set up an account as an acceptable bailout.
                 Accounts.actionShowAccounts(this);
                 mDraftNeedsSaving = false;
                 finish();
                 return;
             }
-            if (intent.getData() != null) {
-                Uri uri = intent.getData();
-                try {
-                    if (uri.getScheme().equalsIgnoreCase("mailto")) {
-                        Address[] addresses = Address.parse(uri.getSchemeSpecificPart());
-                        addAddresses(mToView, addresses);
-                    }
-                }
-                catch (Exception e) {
-                    /*
-                     * If we can't extract any information from the URI it's okay. They can
-                     * still compose a message.
-                     */
-                }
-            }
-        }
-        else if (Intent.ACTION_SEND.equals(action)) {
-            /*
-             * Someone is trying to compose an email with an attachment, probably Pictures.
-             * The Intent should contain an EXTRA_STREAM with the data to attach.
-             */
-
-            mAccount = Preferences.getPreferences(this).getDefaultAccount();
-            if (mAccount == null) {
-                /*
-                 * There are no accounts set up. This should not have happened. Prompt the
-                 * user to set up an account as an acceptable bailout.
-                 */
-                Accounts.actionShowAccounts(this);
-                mDraftNeedsSaving = false;
-                finish();
-                return;
-            }
-
-            String type = intent.getType();
-            Uri stream = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (stream != null && type != null) {
-                if (MimeUtility.mimeTypeMatches(type, Email.ACCEPTABLE_ATTACHMENT_SEND_TYPES)) {
-                    addAttachment(stream);
-                }
-            }
+            
+            // Use the fields found in the Intent to prefill as much of the message as possible
+            initFromIntent(intent);
         }
         else {
+            // Otherwise, handle the internal cases (Message Composer invoked from within app)
             mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT);
             mFolder = intent.getStringExtra(EXTRA_FOLDER);
             mSourceMessageUid = intent.getStringExtra(EXTRA_MESSAGE);
@@ -528,11 +493,20 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             return;
         }
         for (Address address : addresses) {
-            addAddress(view, address);
+            addAddress(view, address.toString());
+        }
+    }
+    
+    private void addAddresses(MultiAutoCompleteTextView view, String[] addresses) {
+        if (addresses == null) {
+            return;
+        }
+        for (String oneAddress : addresses) {
+            addAddress(view, oneAddress);
         }
     }
 
-    private void addAddress(MultiAutoCompleteTextView view, Address address) {
+    private void addAddress(MultiAutoCompleteTextView view, String address) {
         view.append(address + ", ");
     }
 
@@ -902,13 +876,149 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             return true;
         }
     }
+    
+    /**
+     * Fill all the widgets with the content found in the Intent Extra, if any.  
+     * 
+     * Note that we don't actually check the intent action  (typically VIEW, SENDTO, or SEND).
+     * There is enough overlap in the definitions that it makes more sense to simply check for
+     * all available data and use as much of it as possible.
+     * 
+     * With one exception:  EXTRA_STREAM is defined as only valid for ACTION_SEND.
+     * 
+     * @param intent the launch intent
+     */
+    /* package */ void initFromIntent(Intent intent) {
+        
+        // First, add values stored in top-level extras
+        
+        String[] extraStrings = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
+        if (extraStrings != null) {
+            addAddresses(mToView, extraStrings);
+        }
+        extraStrings = intent.getStringArrayExtra(Intent.EXTRA_CC);
+        if (extraStrings != null) {
+            addAddresses(mCcView, extraStrings);
+        }
+        extraStrings = intent.getStringArrayExtra(Intent.EXTRA_BCC);
+        if (extraStrings != null) {
+            addAddresses(mBccView, extraStrings);
+        }
+        String extraString = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+        if (extraString != null) {
+            mSubjectView.setText(extraString);
+        }
+
+        // Next, if we were invoked with a URI, try to interpret it
+        // We'll take two courses here.  If it's mailto:, there is a specific set of rules
+        // that define various optional fields.  However, for any other scheme, we'll simply
+        // take the entire scheme-specific part and interpret it as a possible list of addresses.
+        
+        final Uri dataUri = intent.getData();
+        if (dataUri != null) {
+            if ("mailto".equals(dataUri.getScheme())) {
+                initializeFromMailTo(dataUri.toString());
+            } else {
+                String toText = dataUri.getSchemeSpecificPart();
+                if (toText != null) {
+                    addAddresses(mToView, toText.split(","));
+                }
+            }
+        }
+
+        // Next, fill in the plaintext (note, this will override mailto:?body=)
+        
+        CharSequence text = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);
+        if (text != null) {
+            mMessageContentView.setText(text);
+        }
+        
+        // Next, convert EXTRA_STREAM into an attachment
+        
+        if (Intent.ACTION_SEND.equals(intent.getAction()) && intent.hasExtra(Intent.EXTRA_STREAM)) {
+            String type = intent.getType();
+            Uri stream = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            if (stream != null && type != null) {
+                if (MimeUtility.mimeTypeMatches(type, Email.ACCEPTABLE_ATTACHMENT_SEND_TYPES)) {
+                    addAttachment(stream);
+                }
+            }
+        }
+        
+        // Finally - expose fields that were filled in but are normally hidden, and set focus
+        
+        if (mCcView.length() > 0) {
+            mCcView.setVisibility(View.VISIBLE);
+        }
+        if (mBccView.length() > 0) {
+            mBccView.setVisibility(View.VISIBLE);
+        }
+        setNewMessageFocus();
+        mDraftNeedsSaving = false;
+    }
+
+    /**
+     * When we are launched with an intent that includes a mailto: URI, we can actually
+     * gather quite a few of our message fields from it.
+     * 
+     * @mailToString the href (which must start with "mailto:").
+     */
+    private void initializeFromMailTo(String mailToString) {
+        
+        // Chop up everything between mailto: and ? to find recipients
+        int index = mailToString.indexOf("?");
+        int length = "mailto".length() + 1; 
+        String to;
+        try {
+            // Extract the recipient after mailto:
+            if (index == -1) {
+                to = decode(mailToString.substring(length));
+            } else {
+                to = decode(mailToString.substring(length, index));
+            }
+            addAddresses(mToView, to.split(" ,"));
+        } catch (UnsupportedEncodingException e) {
+            Log.e(Email.LOG_TAG, e.getMessage() + " while decoding '" + mailToString + "'");
+        }
+
+        // Extract the other parameters
+
+        // We need to disguise this string as a URI in order to parse it
+        Uri uri = Uri.parse("foo://" + mailToString);
+
+        List<String> cc = uri.getQueryParameters("cc");
+        addAddresses(mCcView, cc.toArray(new String[cc.size()]));
+
+        List<String> otherTo = uri.getQueryParameters("to");
+        addAddresses(mCcView, otherTo.toArray(new String[otherTo.size()]));
+
+        List<String> bcc = uri.getQueryParameters("bcc");
+        addAddresses(mBccView, bcc.toArray(new String[bcc.size()]));
+
+        List<String> subject = uri.getQueryParameters("subject");
+        if (subject.size() > 0) {
+            mSubjectView.setText(subject.get(0));
+        }
+
+        List<String> body = uri.getQueryParameters("body");
+        if (body.size() > 0) {
+            mMessageContentView.setText(body.get(0));
+        }
+    }
+
+    private String decode(String s) throws UnsupportedEncodingException {
+        return URLDecoder.decode(s, "UTF-8");
+    }
 
     /**
      * Pull out the parts of the now loaded source message and apply them to the new message
      * depending on the type of message being composed.
      * @param message
      */
-    /* package */ void processSourceMessage(Message message) {
+    /* package */ /**
+     * @param message
+     */
+    void processSourceMessage(Message message) {
         String action = getIntent().getAction();
         if (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action)) {
             try {
@@ -933,13 +1043,13 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
                 if (ACTION_REPLY_ALL.equals(action)) {
                     for (Address address : message.getRecipients(RecipientType.TO)) {
                         if (!address.getAddress().equalsIgnoreCase(mAccount.getEmail())) {
-                            addAddress(mToView, address);
+                            addAddress(mToView, address.toString());
                         }
                     }
                     if (message.getRecipients(RecipientType.CC).length > 0) {
                         for (Address address : message.getRecipients(RecipientType.CC)) {
                             if (!Utility.arrayContains(replyToAddresses, address)) {
-                                addAddress(mCcView, address);
+                                addAddress(mCcView, address.toString());
                             }
                         }
                         mCcView.setVisibility(View.VISIBLE);
@@ -1029,12 +1139,21 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             }
         }
         
-        // In order to accelerate typing, position the cursor in the first empty field, 
-        // or at the end of the body composition field if none are empty.  Typically, this will
-        // play out as follows:
-        //  Reply / Reply All - put cursor in the empty message body
-        //  Forward - put cursor in the empty To field
-        //  Edit Draft - put cursor in whatever field still needs entry
+        setNewMessageFocus();
+        
+        mSourceMessageProcessed = true;
+        mDraftNeedsSaving = false;
+    }
+
+    /**
+     * In order to accelerate typing, position the cursor in the first empty field, 
+     * or at the end of the body composition field if none are empty.  Typically, this will
+     * play out as follows:
+     *   Reply / Reply All - put cursor in the empty message body
+     *   Forward - put cursor in the empty To field
+     *   Edit Draft - put cursor in whatever field still needs entry
+     */
+    private void setNewMessageFocus() {
         if (mToView.length() == 0) {
             mToView.requestFocus();
         } else if (mSubjectView.length() == 0) {
@@ -1046,9 +1165,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             int selection = mMessageContentView.length();
             mMessageContentView.setSelection(selection, selection);
         }
-        
-        mSourceMessageProcessed = true;
-        mDraftNeedsSaving = false;
     }
 
     class Listener extends MessagingListener {
diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index adf694645..fcd9ce7cc 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -48,6 +48,7 @@ import com.android.email.EmailAddressValidator;
 import com.android.email.Preferences;
 import com.android.email.R;
 import com.android.email.Utility;
+import com.android.email.activity.Debug;
 
 /**
  * Prompts the user for the email address and password. Also prompts for
@@ -59,6 +60,7 @@ import com.android.email.Utility;
  */
 public class AccountSetupBasics extends Activity
         implements OnClickListener, TextWatcher {
+    private final static boolean ENTER_DEBUG_SCREEN = true;
     private final static String EXTRA_ACCOUNT = "com.android.email.AccountSetupBasics.account";
     private final static int DIALOG_NOTE = 1;
     private final static String STATE_KEY_PROVIDER =
@@ -180,6 +182,8 @@ public class AccountSetupBasics extends Activity
         if (id == DIALOG_NOTE) {
             if (mProvider != null && mProvider.note != null) {
                 return new AlertDialog.Builder(this)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setTitle(android.R.string.dialog_alert_title)
                     .setMessage(mProvider.note)
                     .setPositiveButton(
                             getString(R.string.okay_action),
@@ -294,6 +298,14 @@ public class AccountSetupBasics extends Activity
         String[] emailParts = email.split("@");
         String user = emailParts[0].trim();
         String domain = emailParts[1].trim();
+        
+        // Alternate entry to the debug options screen (for devices without a physical keyboard:
+        //  Username: d@d
+        //  Password: debug
+        if (ENTER_DEBUG_SCREEN && "d@d".equals(email) && "debug".equals(password)) {
+            startActivity(new Intent(this, Debug.class));
+            return;
+        }
 
         mAccount = new Account(this);
         mAccount.setName(getOwnerName());
diff --git a/src/com/android/email/activity/setup/AccountSetupCheckSettings.java b/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
index 290f704d4..c54203fd8 100644
--- a/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/android/email/activity/setup/AccountSetupCheckSettings.java
@@ -196,6 +196,7 @@ public class AccountSetupCheckSettings extends Activity implements OnClickListen
                 }
                 mProgressBar.setIndeterminate(false);
                 new AlertDialog.Builder(AccountSetupCheckSettings.this)
+                        .setIcon(android.R.drawable.ic_dialog_alert)
                         .setTitle(getString(R.string.account_setup_failed_dlg_title))
                         .setMessage(getString(msgResId, args))
                         .setCancelable(true)
diff --git a/src/com/android/email/mail/internet/MimeMessage.java b/src/com/android/email/mail/internet/MimeMessage.java
index 912f5380e..6a2339d59 100644
--- a/src/com/android/email/mail/internet/MimeMessage.java
+++ b/src/com/android/email/mail/internet/MimeMessage.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Stack;
 
 import org.apache.james.mime4j.BodyDescriptor;
@@ -51,7 +52,13 @@ public class MimeMessage extends Message {
     protected Address[] mBcc;
     protected Address[] mReplyTo;
     protected Date mSentDate;
-    protected SimpleDateFormat mDateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z");
+    // In MIME, en_US-like date format should be used. In other words "MMM" should be encoded to
+    // "Jan", not the other localized format like "Ene" (meaning January in locale es).
+    // This conversion is used when generating outgoing MIME messages. Incoming MIME date
+    // headers are parsed by org.apache.james.mime4j.field.DateTimeField which does not have any
+    // localization code.
+    protected SimpleDateFormat mDateFormat = 
+        new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
     protected Body mBody;
     protected int mSize;
 
diff --git a/src/com/android/email/mail/store/ImapResponseParser.java b/src/com/android/email/mail/store/ImapResponseParser.java
index 96b4181db..4c7028b89 100644
--- a/src/com/android/email/mail/store/ImapResponseParser.java
+++ b/src/com/android/email/mail/store/ImapResponseParser.java
@@ -22,6 +22,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Locale;
 
 import android.util.Config;
 import android.util.Log;
@@ -35,7 +36,10 @@ public class ImapResponseParser {
     // DEBUG ONLY - Always check in as "false"
     private static boolean DEBUG_LOG_RAW_STREAM = false;
     
-    SimpleDateFormat mDateTimeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z");
+    // mDateTimeFormat is used only for parsing IMAP's FETCH ENVELOPE command, in which
+    // en_US-like date format is used like "01-Jan-2009 11:20:39 -0800", so this should be
+    // handled by Locale.US
+    SimpleDateFormat mDateTimeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z", Locale.US);
     PeekableInputStream mIn;
     InputStream mActiveLiteral;
 
diff --git a/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java b/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
index bdd88150c..b831d8013 100644
--- a/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
+++ b/tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
@@ -16,7 +16,11 @@
 
 package com.android.email.activity;
 
+import com.android.email.Account;
+import com.android.email.Email;
+import com.android.email.Preferences;
 import com.android.email.R;
+import com.android.email.activity.MessageCompose;
 import com.android.email.mail.Address;
 import com.android.email.mail.Message;
 import com.android.email.mail.MessagingException;
@@ -25,10 +29,12 @@ import com.android.email.mail.internet.MimeMessage;
 import com.android.email.mail.internet.TextBody;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 import android.widget.EditText;
+import android.content.Context;
 
 /**
  * Various instrumentation tests for MessageCompose.  
@@ -46,6 +52,8 @@ public class MessageComposeInstrumentationTests
     private static final String SENDER = "sender@android.com";
     private static final String REPLYTO = "replyto@android.com";
     private static final String RECIPIENT_TO = "recipient-to@android.com";
+    private static final String RECIPIENT_CC = "recipient-cc@android.com";
+    private static final String RECIPIENT_BCC = "recipient-bcc@android.com";
     private static final String SUBJECT = "This is the subject";
     private static final String BODY = "This is the body.  This is also the body.";
    
@@ -59,12 +67,22 @@ public class MessageComposeInstrumentationTests
         super("com.android.email", MessageCompose.class);
     }
 
-    /**
-     * Common setup code for all tests.  Attaches to the Activity and 
+    /*
+     * The Message Composer activity is only enabled if one or more accounts
+     * are configured on the device and a default account has been specified,
+     * so we do that here before every test.
      */
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        Context context = getInstrumentation().getTargetContext();
+        Account[] accounts = Preferences.getPreferences(context).getAccounts();
+        if (accounts.length > 0)
+        {
+            // This depends on getDefaultAccount() to auto-assign the default account, if necessary
+            Preferences.getPreferences(context).getDefaultAccount();
+            Email.setServicesEnabled(context);
+        }
         final MessageCompose a = getActivity();
         mToView = (EditText) a.findViewById(R.id.to);
         mSubjectView = (EditText) a.findViewById(R.id.subject);
@@ -105,7 +123,7 @@ public class MessageComposeInstrumentationTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.processSourceMessage(message);
-                checkFields(SENDER + ", ", "Re: " + SUBJECT, null);
+                checkFields(SENDER + ", ", null, null, "Re: " + SUBJECT, null);
                 checkFocused(mMessageView);
             }
         });
@@ -117,7 +135,7 @@ public class MessageComposeInstrumentationTests
             public void run() {
                 resetViews();
                 a.processSourceMessage(message);
-                checkFields(REPLYTO + ", ", "Re: " + SUBJECT, null);
+                checkFields(REPLYTO + ", ", null, null, "Re: " + SUBJECT, null);
                 checkFocused(mMessageView);
             }
         });
@@ -139,7 +157,7 @@ public class MessageComposeInstrumentationTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.processSourceMessage(message);
-                checkFields(null, "Fwd: " + SUBJECT, null);
+                checkFields(null, null, null, "Fwd: " + SUBJECT, null);
                 checkFocused(mToView);
             }
         });
@@ -164,7 +182,7 @@ public class MessageComposeInstrumentationTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.processSourceMessage(message);
-                checkFields(RECIPIENT_TO + ", ", SUBJECT, BODY);
+                checkFields(RECIPIENT_TO + ", ", null, null, SUBJECT, BODY);
                 checkFocused(mMessageView);
             }
         });
@@ -177,21 +195,100 @@ public class MessageComposeInstrumentationTests
             public void run() {
                 resetViews();
                 a.processSourceMessage(message);
-                checkFields(RECIPIENT_TO + ", ", null, BODY);
+                checkFields(RECIPIENT_TO + ", ", null, null, null, BODY);
                 checkFocused(mSubjectView);
             }
         });
         
     }
     
+    /**
+     * Test for processing of Intent EXTRA_* fields that impact the headers:
+     *   Intent.EXTRA_EMAIL, Intent.EXTRA_CC, Intent.EXTRA_BCC, Intent.EXTRA_SUBJECT
+     */
+    public void testIntentHeaderExtras() throws MessagingException, Throwable {
+        
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.putExtra(Intent.EXTRA_EMAIL, new String[] { RECIPIENT_TO });
+        intent.putExtra(Intent.EXTRA_CC, new String[] { RECIPIENT_CC });
+        intent.putExtra(Intent.EXTRA_BCC, new String[] { RECIPIENT_BCC });
+        intent.putExtra(Intent.EXTRA_SUBJECT, SUBJECT);
+        
+        final MessageCompose a = getActivity();
+        final Intent i2 = new Intent(intent);
+        
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                a.initFromIntent(i2);
+                checkFields(RECIPIENT_TO + ", ", RECIPIENT_CC, RECIPIENT_BCC, SUBJECT, null);
+                checkFocused(mMessageView);
+            }
+        });
+    }
+    
+    /**
+     * Test for processing of a typical browser "share" intent, e.g.
+     * type="text/plain", EXTRA_TEXT="http:link.server.com"
+     */
+    public void testIntentSendPlainText() throws MessagingException, Throwable {
+        
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TEXT, BODY);
+        
+        final MessageCompose a = getActivity();
+        final Intent i2 = new Intent(intent);
+        
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                a.initFromIntent(i2);
+                checkFields(null, null, null, null, BODY);
+                checkFocused(mToView);
+            }
+        });
+    }
+    
+    /**
+     * Test for processing of a typical browser Mailto intent, e.g.
+     * action=android.intent.action.VIEW
+     * categories={android.intent.category.BROWSABLE}
+     * data=mailto:user@domain.com?subject=This%20is%20%the%subject
+     */
+    public void testBrowserMailToIntent() throws MessagingException, Throwable {
+        
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        Uri uri = Uri.parse("mailto:" + RECIPIENT_TO + "?subject=This%20is%20the%20subject");
+        intent.setData(uri);
+        
+        final MessageCompose a = getActivity();
+        final Intent i2 = new Intent(intent);
+        
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                a.initFromIntent(i2);
+                checkFields(RECIPIENT_TO + ", ", null, null, "This is the subject", null);
+                checkFocused(mMessageView);
+            }
+        });
+    }
+    
+    /**
+     * TODO: test mailto: with simple encoding mode
+     * TODO: test mailto: URI with all optional fields
+     * TODO: come up with a way to add a very small attachment
+     * TODO: confirm the various details between handling of SEND, VIEW, SENDTO
+     */
+    
     /**
      * Helper method to quickly check (and assert) on the to, subject, and content views.
      * 
-     * @param to expected value
-     * @param subject expected value
-     * @param content expected value
+     * @param to expected value (null = it must be empty)
+     * @param cc expected value (null = it must be empty)
+     * @param bcc expected value (null = it must be empty)
+     * @param subject expected value (null = it must be empty)
+     * @param content expected value (null = it must be empty)
      */
-    private void checkFields(String to, String subject, String content) {
+    private void checkFields(String to, String cc, String bcc, String subject, String content) {
         String toText = mToView.getText().toString();
         if (to == null) {
             assertEquals(0, toText.length());
diff --git a/tests/src/com/android/email/mail/internet/MimeMessageTest.java b/tests/src/com/android/email/mail/internet/MimeMessageTest.java
new file mode 100644
index 000000000..8cc6fb51f
--- /dev/null
+++ b/tests/src/com/android/email/mail/internet/MimeMessageTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.android.email.mail.internet;
+
+import com.android.email.mail.MessagingException;
+import com.android.email.mail.internet.MimeMessage;
+
+import junit.framework.TestCase;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+/**
+ * This is a series of unit tests for the MimeMessage class.  These tests must be locally
+ * complete - no server(s) required.
+ */
+@SmallTest
+public class MimeMessageTest extends TestCase {
+
+    // TODO: more tests.
+    
+    /**
+     * Confirms that setSentDate() correctly set the "Date" header of a Mime message.
+     * 
+     * We tries a same test twice using two locales, Locale.US and the other, since
+     * MimeMessage depends on the date formatter, which may emit wrong date format
+     * in the locale other than Locale.US.
+     * @throws MessagingException
+     * @throws ParseException
+     */
+    public void testSetSentDate() throws MessagingException, ParseException {
+        Locale savedLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
+        doTestSetSentDate();        
+        Locale.setDefault(Locale.JAPAN);
+        doTestSetSentDate();        
+        Locale.setDefault(savedLocale);
+    }
+    
+    private void doTestSetSentDate() throws MessagingException, ParseException {
+        // "Thu, 01 Jan 2009 09:00:00 +0000" => 1230800400000L 
+        long expectedTime = 1230800400000L;
+        Date date = new Date(expectedTime);
+        MimeMessage message = new MimeMessage();
+        message.setSentDate(date);
+        String[] headers = message.getHeader("Date");
+        assertEquals(1, headers.length);
+        // Explicitly specify the locale so that the object does not depend on the default
+        // locale.
+        SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
+        
+        Date result = format.parse(headers[0]);
+        assertEquals(expectedTime, result.getTime());
+    }
+}
\ No newline at end of file
diff --git a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
index d2f76a1e8..f1ef6e46e 100644
--- a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
+++ b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java
@@ -20,10 +20,15 @@ import com.android.email.mail.MessagingException;
 import com.android.email.mail.Transport;
 import com.android.email.mail.Folder.OpenMode;
 import com.android.email.mail.internet.BinaryTempFileBody;
+import com.android.email.mail.store.ImapResponseParser;
 import com.android.email.mail.transport.MockTransport;
 
+import java.util.Date;
+import java.util.Locale;
+
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
 
 /**
  * This is a series of unit tests for the ImapStore class.  These tests must be locally
@@ -65,6 +70,38 @@ public class ImapStoreUnitTests extends AndroidTestCase {
         // TODO: inject specific facts in the initial folder SELECT and check them here
     }
     
+    /** 
+     * Confirms that ImapList object correctly returns an appropriate Date object
+     * without throwning MessagingException when getKeyedDate() is called.
+     *
+     * Here, we try a same test twice using two locales, Locale.US and the other.
+     * ImapList uses Locale class internally, and as a result, there's a
+     * possibility in which it may throw a MessageException when Locale is
+     * not Locale.US. Locale.JAPAN is a typical locale which emits different
+     * date formats, which had caused a bug before.
+     * @throws MessagingException
+     */
+    public void testImapListWithUsLocale() throws MessagingException {
+        Locale savedLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
+        doTestImapList();
+        Locale.setDefault(Locale.JAPAN);
+        doTestImapList();
+        Locale.setDefault(savedLocale);
+    }
+    
+    private void doTestImapList() throws MessagingException {
+        ImapResponseParser parser = new ImapResponseParser(null);
+        ImapResponseParser.ImapList list = parser.new ImapList();
+        String key = "key";
+        String date = "01-Jan-2009 01:00:00 -0800";
+        list.add(key);
+        list.add(date);
+        Date result = list.getKeyedDate(key);
+        // "01-Jan-2009 09:00:00 +0000" => 1230800400000L 
+        assertEquals(1230800400000L, result.getTime());
+    }
+    
     /**
      * TODO: Test with SSL negotiation (faked)
      * TODO: Test with SSL required but not supported