Merge commit '4.116' into issue-162-new

Conflicts: src/com/fsck/k9/activity/MessageView.java src/com/fsck/k9/activity/setup/FolderSettings.java
2024-11-16 22:45:04 -05:00 · 2012-09-11 01:20:38 -05:00 · 2012-09-11 01:20:38 -05:00 · b9c83aefe6
commit b9c83aefe6
parent b6df5c908b e5c8a25c8b
40 changed files with 1812 additions and 373 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="15014"
-    android:versionName="4.115" package="com.fsck.k9"
+    android:versionCode="15015"
+    android:versionName="4.116" package="com.fsck.k9"
    >
    <uses-sdk
       android:minSdkVersion="7"
--- a/build.xml
+++ b/build.xml
@ -179,14 +179,14 @@
     </target>
    <target name="astyle">
    <exec executable="astyle" failonerror="true">
-        <arg line="--style=java --indent=spaces=4 --brackets=attach --convert-tabs   --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java'"/>
+        <arg line="--style=java --indent=spaces=4 --indent-switches --max-instatement-indent=4 --brackets=attach --add-brackets --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java' 'tests/src/com/fsck/k9/*.java'"/>
    </exec>
     </target>
    <target name="help">
        <!-- displays starts at col 13
              |13                                                              80| -->
        <echo>Android Ant Build. Available targets:</echo>
-        <echo>   help:      Displays this help.</echo>
+        <echo>   help:      Displays this help.</echo> 
        <echo>   debug:     Builds the application and sign it with a debug key.</echo>
        <echo>   release:   Builds the application. The generated apk file must be</echo>
        <echo>              signed before it is published.</echo>
--- a/k9mail.iml
+++ b/k9mail.iml
@ -35,7 +35,6 @@
      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library">
      <library>
@ -103,6 +102,7 @@
        <SOURCES />
      </library>
    </orderEntry>
+    <orderEntry type="inheritedJdk" />
  </component>
 </module>

--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@ -233,8 +233,6 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
    <string name="debug_enable_sensitive_logging_title">Registra info sensible</string>
    <string name="debug_enable_sensitive_logging_summary">Pot mostrar les contrasenyes en els registres.</string>

-    <string name="message_header_mua">K-9 Mail per Android</string>
-
    <string name="combined_inbox_title">Tot el correu</string>
    <string name="combined_inbox_label">Missatges recents de tots els comptes</string>
    <string name="combined_inbox_list_title">Tot el correu de la Bústia d’entrada</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@ -239,8 +239,6 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
    <string name="debug_enable_sensitive_logging_title">Záznam citlivých informací</string>
    <string name="debug_enable_sensitive_logging_summary">V záznamech mohou být zobrazena hesla</string>

-    <string name="message_header_mua">K-9 Mail pro Android</string>
-
    <string name="combined_inbox_title">Veškerá pošta</string>
    <string name="combined_inbox_label">Poslední zprávy ze všech účtů</string>
    <string name="combined_inbox_list_title">Veškerá doručená pošta</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@ -5,7 +5,6 @@
    <string name="app_authors">Google, The K-9 Dog Walkers.</string>
    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Visse dele Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
    <string name="app_license">Licenseret under the Apache License, Version 2.0.</string>
-    <string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright (c) 2006-2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
    <string name="app_authors_fmt">Ophavsmænd: <xliff:g id="app_authors">%s</xliff:g></string>
    <string name="app_revision_fmt">Revisions information: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">Vi anvender følgende 3je parts biblioteker: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -234,8 +233,6 @@ Velkommen til K-9 Mail opsætning.  K-9 er en open source mail klient for Androi
    <string name="debug_enable_sensitive_logging_title">Log sensitiv information</string>
    <string name="debug_enable_sensitive_logging_summary">Kan eksponere passwords i logs.</string>

-    <string name="message_header_mua">K-9 Mail for Android</string>
-
    <string name="combined_inbox_title">Alle mails</string>
    <string name="combined_inbox_label">Nye mails fra alle konti</string>
    <string name="combined_inbox_list_title">Indbakke med alle nye mails</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -232,8 +232,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
    <string name="debug_enable_sensitive_logging_title">Vertrauliche Informationen aufzeichnen</string>
    <string name="debug_enable_sensitive_logging_summary">Anmeldepasswörter bei Verbindungsaufbau aufzeichnen</string>

-    <string name="message_header_mua">K-9 Mail for Android</string>
-
    <string name="combined_inbox_title">Alle Nachrichten</string>
    <string name="combined_inbox_label">Neue Nachrichten aller Konten</string>
    <string name="combined_inbox_list_title">Globaler Posteingang</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@ -3,19 +3,16 @@
    <string name="app_name">K-9 Mail</string>
    <string name="beta_app_name">K-9 Mail BETA</string>
    <string name="app_authors">Google, The K-9 Dog Walkers.</string>
-    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
-    <string name="app_license">Licensed under the Apache License, Version 2.0.</string>
-    <string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright (c) 2006-2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
+    <string name="app_copyright_fmt">Πνευματικά δικαιώματα 2008-<xliff:g>%s</xliff:g> από The K-9 Dog Walkers. Τμηματικά πνευματικά δικαιώματα 2006-<xliff:g>%s</xliff:g> από το Android Open Source Project.</string>
+    <string name="app_license">Διέπεται από την άδεια χρήσης Apache, έκδοση 2.0.</string>
    <string name="app_authors_fmt">Συγγραφείς: <xliff:g id="app_authors">%s</xliff:g></string>
    <string name="app_revision_fmt">Πληροφορίες αναθεωρήσεων: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">Χρησιμοποιούνται οι ακόλουθες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_emoji_icons">Εικονίδια Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>

    <string name="read_attachment_label">Ανάγνωση συνημμένων</string>
-
    <string name="read_attachment_desc">Επιτρέπει στην εφαρμογή να διαβάζει τα συνημμένα των email.</string>
    <string name="read_messages_label">Ανάγνωση μηνυμάτων</string>
-
    <string name="read_messages_desc">Επιτρέπει στην εφαρμογή να διαβάζει τα email.</string>
    <string name="delete_messages_label">Διαγραφή μηνυμάτων</string>
    <string name="delete_messages_desc">Επιτρέπει στην εφαρμογή να σβήνει τα email.</string>
@ -75,7 +72,6 @@
    <string name="list_folders_action">Λίστα φακέλων</string>
    <string name="refresh_folders_action">Ανανέωση φακέλων</string>
    <string name="filter_folders_action">Εύρεση φακέλου</string>
-	
    <string name="mark_all_as_read_action">Σήμανση όλων των μηνυμάτων ως αναγνωσμένων</string>
    <string name="add_account_action">Προσθήκη λογαριασμού</string>
    <string name="compose_action">Δημιουργία νέου</string>
@ -87,7 +83,6 @@
    <string name="folder_settings_action">Ρυθμίσεις φακέλου</string>
    <string name="global_settings_action">Γενικές ρυθμίσεις</string>
    <string name="remove_account_action">Διαγραφή λογαριασμού</string>
-	
    <string name="clear_pending_action">Καθαρισμός εκκρεμών ενεργειών (κίνδυνος!)</string>

    <string name="accounts_action">Λογαριασμοί</string>
@ -99,9 +94,9 @@
    <string name="send_alternate_chooser_title">Επιλογή αποστολέα</string>

    <string name="mark_all_as_read_dlg_title">Σήμανση όλων των μηνυμάτων ως αναγνωσμένων</string>
-	
    <string name="mark_all_as_read_dlg_instructions_fmt">Να σημανθούν όλα τα μηνύματα στο \'<xliff:g id="folder">%s</xliff:g>\' ως αναγνωσμένα; (θα συμπεριληφθούν 
 	τα μηνύματα στο φάκελο που δεν προβάλονται στο K-9)</string>
+
    <string name="flag_action">Προσθήκη αστεριού</string>
    <string name="unflag_action">Αφαίρεση αστεριού</string>
    <string name="copy_action">Αντιγραφή</string>
@ -113,7 +108,6 @@
    <string name="move_to_action">Μετακίνηση προς</string>
    <string name="folders_action">Φάκελοι</string>
    <string name="view_hide_details_action">Προβολή/Απόκρυψη λεπτομερειών</string>
-
    <string name="add_cc_bcc_action">Προσθήκη κοινοποίησης/Ιδιωτικής κοινοποίησης</string>
    <string name="edit_subject_action">Διόρθωση θέματος</string>
    <string name="read_receipt">Απόδειξη ανάγνωσης</string>
@ -155,13 +149,9 @@
    <string name="abbrev_kilobytes">Kb</string>
    <string name="abbrev_bytes">b</string>

-	
-    <string name="account_size_changed">
-	Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' συμπυκνώθηκε από
-    <xliff:g id="oldSize">%s</xliff:g>
-	σε
-	<xliff:g id="newSize">%s</xliff:g>
-	</string>
+    <string name="account_size_changed">Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' συμπυκνώθηκε από
+    <xliff:g id="oldSize">%s</xliff:g>	σε <xliff:g id="newSize">%s</xliff:g></string>
+
    <string name="compacting_account">Συμπύκνωση λογαριασμού \'<xliff:g id="account">%s</xliff:g>\'</string>
    <string name="clearing_account">Καθαρισμός λογαριασμού \'<xliff:g id="account">%s</xliff:g>\'</string>
    <string name="recreating_account">Αναδημιουργία λογαριασμού \'<xliff:g id="account">%s</xliff:g>\'</string>
@ -197,62 +187,41 @@

    <string name="send_failure_subject">Αποτυχία αποστολής μερικών μηνυμάτων</string>
    <string name="send_failure_body_abbrev">Δείτε το φάκελο <xliff:g id="errorFolder">%s</xliff:g> για λεπτομέρειες.</string>
-    
-	
-	
-	
-	<string name="send_failure_body_fmt">Το K-9 αντιμετώπισε ένα πρόβλημα κατά την αποστολή μερικών από τα μηνύματα σας. 
+    <string name="send_failure_body_fmt">Το K-9 αντιμετώπισε ένα πρόβλημα κατά την αποστολή μερικών από τα μηνύματα σας. 
 	Λόγω της φύσης του προβλήματος, το K-9 δεν μπορεί αν είναι βέβαιο αν τα μηνύματα στάλθηκαν ή όχι. 
 	Οι παραλήπτες μπορεί να τα έχουν ήδη λάβει.
-    \u000a\u000aΤα μηνύματα που αφορά το πρόβλημα είναι σημασμένα με αστέρι στα εξερχόμενα.
-    Αν αφαιρέσετε τα αστέρια, το K-9 θα προσπαθήσει να στείλει τα μηνύματα πάλι.
-    Πατήστε παρατεταμένα στα εξερχόμενα για να κάνετε \'Αποστολή μηνύματος\' και να ξεκινήσετε νέα προσπάθεια αποστολής.\u000A\u000a 
+        \u000a\u000aΤα μηνύματα που αφορά το πρόβλημα είναι σημασμένα με αστέρι στα εξερχόμενα.
+        Αν αφαιρέσετε τα αστέρια, το K-9 θα προσπαθήσει να στείλει τα μηνύματα πάλι.
+        Πατήστε παρατεταμένα στα εξερχόμενα για να κάνετε \'Αποστολή μηνύματος\' και να ξεκινήσετε νέα προσπάθεια αποστολής.\u000A\u000a 
 	Ο φάκελος <xliff:g id="errorFolder">%s</xliff:g> μπορεί να περιέχει μηνύματα σφάλματων σχετικά με την αποτυχία.</string>
-    <string name="alert_header">Ειδοποίηση K-9</string>

+    <string name="alert_header">Ειδοποίηση K-9</string>
    <string name="no_connection_alert">Συγχρονισμός και αποστολή ματαιώθηκαν εξαιτίας έλλειψης δικτύου.</string>
+
    <string name="end_of_folder">Όχι άλλα μηνύματα</string>

-    <string name="accounts_welcome">
+    <string name="accounts_welcome">Καλώς ήλθατε στο K-9 Mail. Το K-9 είναι ένας πελάτης ηλεκτρονικού ταχυδρομείου ανοικτού κώδικα  για το Android που αρχικά βασίστηκε στον βασικό email client του Android.
+    	\n\n\nΤα βελτιωμένα χαρακτηριστικά του K-9 είναι:
+	\n * Ταχυδρομείο με σπρώξιμο (push mail) με χρήση IMAP IDLE
+	\n * Καλύτερες επιδόσεις
+	\n * Μετακίνηση μηνυμάτων σε φακέλους
+	\n * Υπογραφές μηνυμάτων
+	\n * Ιδιωτική κοινοποίηση (bcc) προς τον εαυτό
+	\n * Συνδρομές σε φακέλους
+	\n * Συγχρονισμός όλων των φακέλων
+	\n * Παραμετροποίηση διεύθυνσης επιστροφής
+	\n * Συντομεύσεις πληκτρολογίου
+	\n * Καλύτερη υποστήριξη IMAP
+	\n * Αποθήκευση συνημμένων σε κάρτα αποθήκευσης
+	\n * Άδειασμα σκουπιδιών
+	\n * Ταξινόμηση μηνυμάτων
+	\n * ... και άλλα
+	\n
+	\nΤο K-9 δεν υποστηρίζει τους περισσότερους δωρεάν λογαριασμούς Hotmail και, όπως οι περισσότεροι email clients έχει θεματάκια όταν μιλάει με το Microsoft Exchange.
+	\n
+	\n Αναφέρετε προβλήματα, προτείνετε νέα χαρακτηριστικά και υποβάλετε ερωτήματα στο http://k9mail.googlecode.com/

-	Καλώς ήλθατε στο K-9 Mail. Το K-9 είναι ένας πελάτης ηλεκτρονικού ταχυδρομείου ανοικτού κώδικα  για το Android που αρχικά βασίστηκε στον βασικό email client του Android.
-    \n
-
-	\n\nΤα βελτιωμένα χαρακτηριστικά του K-9 είναι:
-\n * Ταχυδρομείο με σπρώξιμο (push mail) με χρήση IMAP IDLE
-
-
-
-
-
-
-
-
-
-
-
-
-
-\n * Καλύτερες επιδόσεις
-\n * Μετακίνηση μηνυμάτων σε φακέλους
-\n * Υπογραφές μηνυμάτων
-\n * Ιδιωτική κοινοποίηση (bcc) προς τον εαυτό
-\n * Συνδρομές σε φακέλους
-\n * Συγχρονισμός όλων των φακέλων
-\n * Παραμετροποίηση διεύθυνσης επιστροφής
-\n * Συντομεύσεις πληκτρολογίου
-\n * Καλύτερη υποστήριξη IMAP
-\n * Αποθήκευση συνημμένων σε κάρτα αποθήκευσης
-\n * Άδειασμα σκουπιδιών
-\n * Ταξινόμηση μηνυμάτων
-\n * ... και άλλα
-\n
-
-\nΤο K-9 δεν υποστηρίζει τους περισσότερους δωρεάν λογαριασμούς Hotmail και, όπως οι περισσότεροι email clients έχει θεματάκια όταν μιλάει με το Microsoft Exchange.
-\n
-
-\n Αναφέρετε προβλήματα, προτείνετε νέα χαρακτηριστικά και υποβάλετε ερωτήματα στο http://k9mail.googlecode.com/
-</string>
+    </string>

    <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
    <string name="debug_enable_debug_logging_title">Ενεργοποίηση καταγραφών αποσφαλμάτωσης</string>
@ -260,10 +229,7 @@
    <string name="debug_enable_sensitive_logging_title">Καταγραφή ευαίσθητων πληροφοριών</string>
    <string name="debug_enable_sensitive_logging_summary">Συνθηματικά μπορεί να εμφανιστούν στις καταγραφές.</string>

-    <string name="message_header_mua">K-9 Mail για Android</string>
-
    <string name="combined_inbox_title">Όλα</string>
-	
    <string name="combined_inbox_label">Πρόσφατα μηνύματα από όλους τους λογαριασμούς</string>
    <string name="combined_inbox_list_title">Όλα τα Εισερχόμενα</string> <!-- Inbox here should be the same as mailbox_name_inbox -->

@ -285,6 +251,7 @@
    <string name="message_compose_bcc_hint">Ιδ κοιν</string>
    <string name="message_compose_subject_hint">Θέμα</string>
    <string name="message_compose_content_hint">Κείμενο μηνύματος</string>
+    <!-- NEW: <string name="message_compose_signature_hint">Signature</string>-->
    <string name="message_compose_quote_header_separator">-------- Πρωτότυπο μήνυμα --------</string>
    <string name="message_compose_quote_header_subject">Θέμα:</string>
    <string name="message_compose_quote_header_send_date">Αποστολή:</string>
@ -295,11 +262,14 @@
    <string name="message_compose_quoted_text_label">Αρχικό μήνυμα</string>
    <string name="message_compose_error_no_recipients">Πρέπει να συμπεριλάβετε τουλάχιστον έναν παραλήπτη.</string>
    <string name="error_contact_address_not_found">Δεν βρέθηκαν διευθύνσεις ηλεκτρονικού ταχυδρομείου.</string>
-
-
    <string name="message_compose_downloading_attachments_toast">Μερικά συνημμένα δεν κατέβηκαν. Θα κατεβούν αυτόματα πριν αποσταλεί αυτό το μήνυμα.</string>
    <string name="message_compose_attachments_skipped_toast">Μερικά συνημμένα δεν μπορούν να προωθηθούν γιατί δεν έχουν κατεβεί.</string>
    <string name="message_compose_show_quoted_text_action">Παράθεση μηνύματος</string>
+    <!-- NEW: <string name="message_compose_description_add_to">Add recipient (To)</string>-->
+    <!-- NEW: <string name="message_compose_description_add_cc">Add recipient (CC)</string>-->
+    <!-- NEW: <string name="message_compose_description_add_bcc">Add recipient (BCC)</string>-->
+    <!-- NEW: <string name="message_compose_description_delete_quoted_text">Remove quoted text</string>-->
+    <!-- NEW: <string name="message_compose_description_edit_quoted_text">Edit quoted text</string>-->

    <string name="message_view_from_format">Από: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
    <string name="message_to_label">Προς:</string>
@ -314,7 +284,6 @@
    <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
    <string name="message_view_status_attachment_saved">Συνημμένο αποθηκεύτηκε στην κάρτα αποθήκευσης ως <xliff:g id="filename">%s</xliff:g>.</string>
    <string name="message_view_status_attachment_not_saved">Αδύνατο να αποθηκευτεί το συνημμένο στην κάρτα αποθήκευσης.</string>
-
    <string name="message_view_show_pictures_instructions">Επέλεξε \'Προβολή εικόνων\' για να προβληθούν οι ενσωματωμένες εικόνες.</string>
    <string name="message_view_show_pictures_action">Προβολή εικόνων</string>
    <string name="message_view_show_message_action">Προβολή μηνύματος</string>
@ -322,16 +291,14 @@
    <string name="message_view_show_more_attachments_action">Περισσότερα&#8230;</string>
    <string name="message_view_fetching_attachment_toast">Ανάσυρση συνημμένου</string>
    <string name="message_view_no_viewer">Δεν υπάρχει πρόγραμμα προβολής για <xliff:g id="mimetype">%s</xliff:g>.</string>
-
    <string name="message_view_download_remainder">Κατέβασμα πλήρους μηνύματος</string>
+    <!-- NEW: <string name="message_view_downloading">Downloading…</string>-->

    <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
-
-
-
    <string name="message_additional_headers_not_downloaded">Δεν έχουν κατεβεί ή αποθηκευτεί όλες οι επικεφαλίδες. Επιλέξτε \'Αποθήκευση όλων των επικεφαλίδων τοπικά\' στις ρυθμίσεις εξυπηρέτη εισερχόμενων του λογαριασμού για να το ενεργοποιήσετε στο μέλλον.</string>
    <string name="message_no_additional_headers_available">Όλες οι επικεφαλίδες έχουν κατεβεί, αλλά δεν υπάρχουν πρόσθετες επικεφαλίδες για να προβληθούν.</string>
    <string name="message_additional_headers_retrieval_failed">Η ανάσυρση πρόσθετων επικεφαλίδων από τη βάση δεδομένων ή τον εξυπηρέτη ταχυδρομείου απέτυχε.</string>
+
    <string name="mailbox_select_dlg_title">Φάκελοι</string>
    <string name="mailbox_select_dlg_new_mailbox_action">Νέος φάκελος</string>

@ -339,8 +306,8 @@

    <string name="folder_push_active_symbol">(Σπρώξιμο)</string>

-
    <string name="from_same_sender">Περισσότερα από αυτόν τον αποστολέα</string>
+
    <string name="message_copied_toast">Το μήνυμα αντιγράφηκε</string>
    <string name="message_moved_toast">Το μήνυμα μετακινήθηκε</string>
    <string name="message_deleted_toast">Το μήνυμα διαγράφηκε</string>
@ -359,7 +326,6 @@
    <string name="global_settings_touchable_summary">Ευρύχωρες λίστες με προεπισκόπηση μηνύματος</string>
    <string name="global_settings_preview_lines_label">Προεπισκόπηση γραμμώνν</string>
    <string name="global_settings_show_correspondent_names_label">Προβολή ονόματος επιστολογράφων</string>
-
    <string name="global_settings_show_correspondent_names_summary">Προβολή ονόματος επιστολογράφων παρά των διευθύνσεων ηλεκτρονικού ταχυδρομείου</string>
    <string name="global_settings_show_contact_name_label">Προβολή ονόματος από επαφές</string>
    <string name="global_settings_show_contact_name_summary">Όνομα επιστολογράφων από Επαφές όταν είναι διαθέσιμο</string>
@ -368,7 +334,6 @@
    <string name="global_settings_registered_name_color_changed">Να χρωματίζονται τα ονόματα στη λίστα επαφών</string>

    <string name="global_settings_messageview_fixedwidth_label">Γραμματοσειρά σταθερού πλάτους</string>
-
    <string name="global_settings_messageview_fixedwidth_summary">Να χρησιμοποιείται γραμματοσειρά σταθερού πλάτους όταν προβάλλονται μηνύματα απλού κειμένου</string>
    <string name="global_settings_messageview_return_to_list_label">Επιστροφή στη λίστα μετά τη διαγραφή</string>
    <string name="global_settings_messageview_return_to_list_summary">Επιστροφή στη λίστα μηνυμάτων μετά τη διαγραφή</string>
@ -385,10 +350,19 @@
    <string name="global_settings_confirm_action_send">Αποστολή</string>

    <string name="global_settings_privacy_mode_title">Ειδοποιήσεων κλειδώματος οθόνης</string>
-
    <string name="global_settings_privacy_mode_summary">Μην προβάλεις το θέμα του μηνύματος στη γραμμή ειδοποιήσεων όταν το σύστημα είνια κλειδωμένο</string>
-    <string name="quiet_time">Ώρες ησυχίας</string>

+    <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
+    <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
+    <!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
+    <!-- NEW: <string name="global_settings_delete">Delete</string>-->
+    <!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
+    <!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
+    <!-- NEW: <string name="global_settings_move">Move</string>-->
+    <!-- NEW: <string name="global_settings_flag">Flag</string>-->
+    <!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
+
+    <string name="quiet_time">Ώρες ησυχίας</string>
    <string name="quiet_time_description">Απενεργοποιεί κουδούνισμα, και αναβοσβήσιμο τη νύχτα</string>
    <string name="quiet_time_starts">Έναρξη ωρών ησυχίας</string>
    <string name="quiet_time_ends">Λήξη ωρών ησυχίας</string>
@ -417,8 +391,8 @@
    <string name="account_setup_names_account_name_label">Ονομασία λογαριασμού (Προαιρετικό):</string>
    <string name="account_setup_names_user_name_label">Όνομα αποστολέα (προβάλλεται στα εξερχόμενα μηνύματα):</string>

-
    <string name="account_setup_finished_toast">Η ρύθμιση του λογαριασμού ολοκληρώθηκε!\n\nΑνάκτηση μηνυμάτων\u2026</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>
@ -508,7 +482,7 @@

    <string name="account_setup_options_title">Επιλογές λογαριασμού</string>

-    <string name="compact_action">Συμπήκνωση</string>
+    <string name="compact_action">Συμπύκνωση</string>
    <string name="clear_action">Καθαρισμός μηνυμάτων (Κίνδυνος!)</string>
    <string name="recreate_action">Ανακατασκευή δεδομένων (Έσχατη λύση!)</string>

@ -520,7 +494,7 @@
    <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">Κάθε 10 λεπτά</string>
-    <string name="account_setup_options_mail_check_frequency_1hour">Κάθε ώρα</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">Κάθε μία ώρα</string>
    <string name="account_setup_options_mail_check_frequency_2hour">Κάθε 2 ώρες</string>
    <string name="account_setup_options_mail_check_frequency_3hour">Κάθε 3 ώρες</string>
    <string name="account_setup_options_mail_check_frequency_6hour">Κάθε 2 ώρες</string>
@ -554,7 +528,7 @@
    <string name="account_setup_options_mail_display_count_250">250 μηνύματα</string>
    <string name="account_setup_options_mail_display_count_500">500 μηνύματα</string>
    <string name="account_setup_options_mail_display_count_1000">1000 μηνύματα</string>
-    <string name="account_setup_options_mail_display_count_all">όλα τα μηνύματα</string>
+    <string name="account_setup_options_mail_display_count_all">Όλα τα μηνύματα</string>

    <string name="move_copy_cannot_copy_unsynced_message">Αδύνατη η αντογραφή ή μετακίνηση μηνύματος που δεν έχει συγχρονιστεί με τον εξυπηρέτη</string>

@ -577,11 +551,13 @@
    <string name="account_settings_notify_sync_summary">Ειδοποίηση στη γραμμή κατάστασης όσο ελέγχεται το γραμματοκιβώτιο</string>
    <string name="account_settings_show_combined_label">Προβολή ενοποιημένων εισερχόμενων</string>
    <string name="account_settings_notify_self_label">Συμπερίληψη εξερχόμενου ταχυδρομείου</string>
-    <string name="account_settings_notify_self_summary">Προβολή ειδοποίησης για μηνυματα που απέστειλα</string>
+    <string name="account_settings_notify_self_summary">Προβολή ειδοποίησης για μηνύματα που απέστειλα</string>
    <string name="account_settings_notification_opens_unread_label">Η ειδοποίηση ανοίγει μη αναγνωσμένα μηνύματα</string>
    <string name="account_settings_notification_opens_unread_summary">Αναζητά μη αναγνωσμένα μηνύματα όταν ανοίγεται η ειδοποίηση</string>
    <string name="account_settings_notification_unread_count_label">Προβολή πλήθους μη αναγνωσμένων</string>
    <string name="account_settings_notification_unread_count_summary">Προβολή πλήθους μη αναγνωσμένων μηνυμάτων στη γραμμή κατάστασης.</string>
+    <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_label">Mark message as read when opening</string>-->
+    <!-- NEW: <string name="account_settings_mark_message_as_read_on_view_summary">Mark a message as read when it is opened for viewing</string>-->

    <string name="account_settings_enable_move_buttons_label">Ενεργοποίηση πλήκτρων αρχειοθέτησης</string>
    <string name="account_settings_enable_move_buttons_summary">Προβολή πλήκτρων Αρχειοθέτηση, Μετακίνηση και Σκουπίδια.</string>
@ -658,21 +634,21 @@
    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
    <string name="account_settings_autodownload_message_size_5120">5Mb</string>
    <string name="account_settings_autodownload_message_size_10240">10Mb</string>
-    <string name="account_settings_autodownload_message_size_any">χωρίς όριο</string>
+    <string name="account_settings_autodownload_message_size_any">Χωρίς όριο</string>

    <string name="account_settings_message_age_label">Συγχρονισμός μηνυμάτων από</string>
-    <string name="account_settings_message_age_any">οποτεδήποτε (χωρίς όριο)</string>
-    <string name="account_settings_message_age_0">σήμερα</string>
-    <string name="account_settings_message_age_1">τις τελευταίες 2 ημέρες</string>
-    <string name="account_settings_message_age_2">τις τελευταίες 3 ημέρες</string>
-    <string name="account_settings_message_age_7">την τελευταία εβδομάδα</string>
-    <string name="account_settings_message_age_14">τις 2 τελευταίες εβδομάδες</string>
-    <string name="account_settings_message_age_21">τις τελευταίες 3 εβδομάδες</string>
-    <string name="account_settings_message_age_1_month">τον τελευταίο μήνα</string>
-    <string name="account_settings_message_age_2_months">τους τελευταίους 2 μήνες</string>
-    <string name="account_settings_message_age_3_months">τους τελευταίους 3 μήνες</string>
-    <string name="account_settings_message_age_6_months">τους τελευταίους 6 μήνες</string>
-    <string name="account_settings_message_age_1_year">το τελευταίο έτος</string>
+    <string name="account_settings_message_age_any">Οποτεδήποτε (χωρίς όριο)</string>
+    <string name="account_settings_message_age_0">Σήμερα</string>
+    <string name="account_settings_message_age_1">Τις τελευταίες 2 ημέρες</string>
+    <string name="account_settings_message_age_2">Τις τελευταίες 3 ημέρες</string>
+    <string name="account_settings_message_age_7">Την τελευταία εβδομάδα</string>
+    <string name="account_settings_message_age_14">Τις 2 τελευταίες εβδομάδες</string>
+    <string name="account_settings_message_age_21">Τις τελευταίες 3 εβδομάδες</string>
+    <string name="account_settings_message_age_1_month">Τον τελευταίο μήνα</string>
+    <string name="account_settings_message_age_2_months">Τους τελευταίους 2 μήνες</string>
+    <string name="account_settings_message_age_3_months">Τους τελευταίους 3 μήνες</string>
+    <string name="account_settings_message_age_6_months">Τους τελευταίους 6 μήνες</string>
+    <string name="account_settings_message_age_1_year">Το τελευταίο έτος</string>

    <string name="account_settings_folder_display_mode_label">Φάκελοι που προβάλονται</string>
    <string name="account_settings_folder_display_mode_all">Όλοι</string>
@ -815,6 +791,7 @@

    <string name="sort_by">Ταξινόμηση κατά...</string>
    <string name="sort_by_date">Ημερομηνία</string>
+    <!-- NEW: <string name="sort_by_arrival">Arrival</string>-->
    <string name="sort_by_sender">Αποστολέα</string>
    <string name="sort_by_subject">Θέμα</string>
    <string name="sort_by_flag">Αστέρι</string>
@ -837,6 +814,7 @@
        \'Plus\' λογαριασμό. Ανοίξτε τον σελιδομετρητή ιστοσελίδων για να προσπελάσετε
 		τέτοιους λογαριασμούς ταχυδρομείου.</string>
    <string name="provider_note_yahoojp">Αν θέλετε να χρησιμοποιήσετε POP3 για αυτόν το πάροχο, πρέπει να επιτρέψετε την χρήση POP3 στη σελίδα ρυθμίσεων του Yahoo mail.</string>
+    <!-- NEW: <string name="provider_note_auonejp">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on au one mail settings page.</string>-->
    <string name="provider_note_naver">Αν θέλετε να χρησιμοποιήσετε IMAP ή POP3 για αυτόν το πάροχο, πρέπει να επιτρέψετε την χρήση IMAP ή POP3 στη σελίδα ρυθμίσεων του Naver.</string>
    <string name="provider_note_hanmail">Αν θέλετε να χρησιμοποιήσετε IMAP ή POP3 για αυτόν το πάροχο, πρέπει να επιτρέψετε την χρήση IMAP ή POP3 στη σελίδα ρυθμίσεων του Hanmail(Daum).</string>
    <string name="provider_note_paran">Αν θέλετε να χρησιμοποιήσετε IMAP ή POP3 για αυτόν το πάροχο, πρέπει να επιτρέψετε την χρήση IMAP ή POP3 στη σελίδα ρυθμίσεων του Paran.</string>
@ -1160,8 +1138,35 @@
    <string name="unread_widget_select_account">Προβολή πλήθους μη αναγνωσμένων για…</string>

    <string name="import_dialog_error_title">Λείπει εφαρμογή επόπτη αρχείων</string>
-    <string name="import_dialog_error_message">Δεν υπάρχιε κατάλληλη εφαρμογή για να χειριστεί την εισαγωγή.
+    <string name="import_dialog_error_message">Δεν υπάρχει κατάλληλη εφαρμογή για να χειριστεί την εισαγωγή.
 	Εγκαταστήστε μια εφαρμογή επόπτη αρχείων από το Android Market</string>
    <string name="open_market">Open Market</string>
    <string name="close">Κλείσιμο</string>
+
+    <!-- NEW: <string name="webview_empty_message">No text</string>-->
+
+    <!-- NEW: <string name="webview_contextmenu_link_view_action">Open for viewing</string>-->
+    <!-- NEW: <string name="webview_contextmenu_link_share_action">Share link</string>-->
+    <!-- NEW: <string name="webview_contextmenu_link_copy_action">Copy link to clipboard</string>-->
+    <!-- NEW: <string name="webview_contextmenu_link_clipboard_label">Link</string>-->
+
+    <!-- NEW: <string name="webview_contextmenu_image_title">Image</string>-->
+    <!-- NEW: <string name="webview_contextmenu_image_view_action">View image</string>-->
+    <!-- NEW: <string name="webview_contextmenu_image_save_action">Save image</string>-->
+    <!-- NEW: <string name="webview_contextmenu_image_download_action">Download image</string>-->
+    <!-- NEW: <string name="webview_contextmenu_image_copy_action">Copy image URL to clipboard</string>-->
+    <!-- NEW: <string name="webview_contextmenu_image_clipboard_label">Image URL</string>-->
+
+    <!-- NEW: <string name="webview_contextmenu_phone_call_action">Call number</string>-->
+    <!-- NEW: <string name="webview_contextmenu_phone_save_action">Save to Contacts</string>-->
+    <!-- NEW: <string name="webview_contextmenu_phone_copy_action">Copy phone number to clipboard</string>-->
+    <!-- NEW: <string name="webview_contextmenu_phone_clipboard_label">Phone number</string>-->
+
+    <!-- NEW: <string name="webview_contextmenu_email_send_action">Send mail</string>-->
+    <!-- NEW: <string name="webview_contextmenu_email_save_action">Save to Contacts</string>-->
+    <!-- NEW: <string name="webview_contextmenu_email_copy_action">Copy email address to clipboard</string>-->
+    <!-- NEW: <string name="webview_contextmenu_email_clipboard_label">Email address</string>-->
+
+    <!-- NEW: <string name="image_saved_as">Saved image as \"<xliff:g id="filename">%s</xliff:g>\"</string>-->
+    <!-- NEW: <string name="image_saving_failed">Saving the image failed.</string>-->
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -2,9 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">K-9 Mail</string>
    <string name="beta_app_name">K-9 Mail BETA</string>
-    <string name="app_authors">Google, The K-9 Dog Walkers.</string>
-    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Partes Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
-    <string name="app_license">Liceciado bajo Licencia Apache, Versión 2.0.</string>
    <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
    <string name="app_revision_fmt">Información de la revisión <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">Estamos usando las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -34,12 +31,12 @@

    <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
    <string name="status_loading_account_folder">\u0020(Poll <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
-    <string name="status_loading_account_folder_headers">\u0020(Recuperando encabezados <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
+    <string name="status_loading_account_folder_headers">\u0020(Recuperando cabeceras <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
    <string name="status_sending_account">\u0020(Enviando <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
    <string name="status_processing_account">\u0020(Proc <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
    <string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>

-    <string name="status_next_poll">\u0020(Próxima comprobación @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <string name="status_next_poll">\u0020(Sincronizará @ <xliff:g id="nexttime">%s</xliff:g>)</string>
    <string name="status_syncing_off">\u0020(Sincronización deshabilitada)</string>

    <!-- Actions will be used as buttons and in menu items -->
@ -60,6 +57,7 @@
    <string name="forward_action">Reenviar</string>
    <string name="move_action">Mover</string>
    <string name="continue_action">Continuar</string>
+    <string name="back_action">Atrás</string>
    <string name="done_action">Hecho</string> <!--  Used to complete a multi-step process -->
    <string name="remove_action">Eliminar</string>
    <string name="discard_action">Descartar</string>
@ -70,6 +68,7 @@
    <string name="send_messages_action">Enviar Correo</string>
    <string name="list_folders_action">Lista de Carpetas</string>
    <string name="refresh_folders_action">Refrescar Carpetas</string>
+    <string name="filter_folders_action">Buscar carpeta</string>
    <string name="mark_all_as_read_action">Marcar todos como leídos</string>
    <string name="add_account_action">Añadir cuenta</string>
    <string name="compose_action">Redactar</string>
@ -81,7 +80,7 @@
    <string name="folder_settings_action">Configurar carpeta</string>
    <string name="global_settings_action">Configuración global</string>
    <string name="remove_account_action">Eliminar cuenta</string>
-    <string name="clear_pending_action">Limipar acciones pendientes (peligroso!)</string>
+    <string name="clear_pending_action">Limpiar acciones pendientes (peligroso!)</string>

    <string name="accounts_action">Cuentas</string>
    <string name="back_to_accounts_action">◀</string>
@ -97,8 +96,8 @@
    <string name="flag_action">Añadir Estrella</string>
    <string name="unflag_action">Eliminar Estrella</string>
    <string name="copy_action">Copiar</string>
-    <string name="show_full_header_action">Ver todos los encabezados</string>
-    <string name="hide_full_header_action">Ocultar todos los encabezados</string>
+    <string name="show_full_header_action">Ver todas las cabeceras</string>
+    <string name="hide_full_header_action">Ocultar todas las cabeceras</string>
    <string name="select_text_action">Seleccionar texto</string>

    <string name="mark_as_unread_action">Marcar No Leído</string>
@ -107,9 +106,9 @@
    <string name="view_hide_details_action">Ver/Ocultar detalles</string>
    <string name="add_cc_bcc_action">Añadir Cc/Bcc</string>
    <string name="edit_subject_action">Editar Asunto</string>
-    <!-- NEW: <string name="read_receipt">Read receipt</string>-->
-    <!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
-    <!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
+    <string name="read_receipt">Acuse de Recibo</string>
+    <string name="read_receipt_enabled">Se solicitará Acuse de Recibo</string>
+    <string name="read_receipt_disabled">Acuse de recibo no solicitado</string>
    <string name="add_attachment_action">Añadir adjunto</string>
    <string name="add_attachment_action_image">Añadir adjunto (Imagen)</string>
    <string name="add_attachment_action_video">Añadir adjunto (Vídeo)</string>
@ -136,7 +135,7 @@
    <string name="status_error">Error</string> <!-- Used in Outbox when a message has failed to send -->
    <string name="status_sending">Enviando</string> <!-- Used in Outbox when a message is currently sending -->

-    <string name="status_loading_more_failed">Intentando cargar más mensages</string>
+    <string name="status_loading_more_failed">Intentando cargar más mensajes</string>

    <string name="load_more_messages_fmt">Cargar <xliff:g id="messages_to_load">%d</xliff:g> más</string>

@ -217,7 +216,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
 \n * Almacenamiento de adjuntos en la SD
 \n * Vaciado de papelera
 \n * Ordenación de mensajes
-\n * ...y muchas más.
+\n * …y muchas más.
 \n
 \nDate cuenta que K-9 no soporta muchas de las cuentas de hotmail, como muchos otros clientes de correo, que tiene ciertas peculiaridades cuando se comunicacn con Microsoft Exchange.
 \n
@ -229,9 +228,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="debug_enable_debug_logging_title">Activar acceso a debug</string>
    <string name="debug_enable_debug_logging_summary">Diagnóstico con información adicional</string>
    <string name="debug_enable_sensitive_logging_title">Información sensible</string>
-    <string name="debug_enable_sensitive_logging_summary">Deben mostrarse password en el log</string>
-
-    <string name="message_header_mua">K-9 Mail for Android</string>
+    <string name="debug_enable_sensitive_logging_summary">Mostrar password en el log</string>

    <string name="combined_inbox_title">Todos los correos</string>
    <string name="combined_inbox_label">Mensajes recientes para todas las cuentas</string>
@ -251,10 +248,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="message_list_unflag_action">Quitar estrella</string>

    <string name="message_compose_to_hint">Para</string>
-    <string name="message_compose_cc_hint">Cc</string>
-    <string name="message_compose_bcc_hint">CCo</string>
+    <string name="message_compose_cc_hint">CC</string>
+    <string name="message_compose_bcc_hint">CCO</string>
    <string name="message_compose_subject_hint">Asunto</string>
    <string name="message_compose_content_hint">Texto del Mensaje</string>
+    <string name="message_compose_signature_hint">Firma</string>
    <string name="message_compose_quote_header_separator">-------- Mensaje Origianl --------</string>
    <string name="message_compose_quote_header_subject">Asunto:</string>
    <string name="message_compose_quote_header_send_date">Enviado:</string>
@ -264,10 +262,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escribió:\n\n</string>
    <string name="message_compose_quoted_text_label">Citado</string>
    <string name="message_compose_error_no_recipients">Debes añadir un destinatario</string>
-    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
+    <string name="error_contact_address_not_found">Dirección e-mail no encontrada.</string>
    <string name="message_compose_downloading_attachments_toast">Algunos adjuntos no se han descargado. Serán descargados automáticamente antes de que se envíe el mensaje</string>
    <string name="message_compose_attachments_skipped_toast">Algunos adjuntos no pueden reenviarse porque no han sido descargados.</string>
-    <!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
+    <string name="message_compose_show_quoted_text_action">Citar mensaje</string>
+    <string name="message_compose_description_add_to">Añadir destinatario (To)</string>
+    <string name="message_compose_description_add_cc">Añadir destinatario (CC)</string>
+    <string name="message_compose_description_add_bcc">Añadir destinatario (BCC)</string>
+    <string name="message_compose_description_delete_quoted_text">Eliminar texto citado</string>
+    <string name="message_compose_description_edit_quoted_text">Editar texto citado</string>

    <string name="message_view_from_format">Desde: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
    <string name="message_to_label">Para:</string>
@ -279,27 +282,30 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="message_view_archive_action">Archivar</string>
    <string name="message_view_move_action">Mover</string>
    <string name="message_view_spam_action">Spam</string>
-    <string name="message_view_datetime_fmt">dd MMM yyyy hh:mm a</string>
+    <string name="message_view_datetime_fmt">dd MM yyyy hh:mm a</string>
    <string name="message_view_status_attachment_saved">Adjunto guardado en la SD como <xliff:g id="filename">%s</xliff:g>.</string>
    <string name="message_view_status_attachment_not_saved">Imposible guardar adjunto en la SD</string>
    <string name="message_view_show_pictures_instructions">Seleccione \"Mostrar imagen\" para ver las imágenes embebidas</string>
    <string name="message_view_show_pictures_action">Mostrar imagen</string>
+    <string name="message_view_show_message_action">Mostrar mensaje</string>
+    <string name="message_view_show_attachments_action">Ver adjuntos</string>
+    <string name="message_view_show_more_attachments_action">Más…</string>
    <string name="message_view_fetching_attachment_toast">Obteniendo adjuntos.</string>
    <string name="message_view_no_viewer">Imposible encontrar visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string>
-
    <string name="message_view_download_remainder">Descargar mensaje completo</string>
+    <!-- NEW: <string name="message_view_downloading">Downloading…</string>-->

    <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
-    <string name="message_additional_headers_not_downloaded">No todos los encabezados han sido descargados o grabados. Seleccione \"Guardar todos los encabezados localmente\" en la Configuración de la cuenta para permitir esta acción en un futuro</string>
-    <string name="message_no_additional_headers_available">Todos los encabezados han sido descargados, pero no hay encabezados adicionales que mostrar</string>
-    <string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar los encabezados adicionales desde la base de datos o el servidor</string>
+    <string name="message_additional_headers_not_downloaded">No todas las cabeceras se han descargado o grabado. Seleccione \"Guardar todas las cabeceras localmente\" en la Configuración de la cuenta para permitir esta acción en un futuro</string>
+    <string name="message_no_additional_headers_available">Todas las cabeceras han sido descargadas, y no hay cabeceras adicionales que mostrar</string>
+    <string name="message_additional_headers_retrieval_failed">Se ha producido un error al descargar las cabeceras desde la base de datos o el servidor</string>

    <string name="mailbox_select_dlg_title">Carpetas</string>
    <string name="mailbox_select_dlg_new_mailbox_action">Nueva Carpeta</string>

    <string name="new_mailbox_dlg_title">Nombre nueva carpeta</string>

-    <string name="folder_push_active_symbol">(Subscripción)</string>
+    <string name="folder_push_active_symbol">(Suscrito)</string>

    <string name="from_same_sender">Más de este remitente</string>

@ -332,21 +338,32 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="global_settings_messageview_fixedwidth_summary">Utilizar tamaño fijo de fuente cuando se muestre mensajes en texto plano</string>
    <string name="global_settings_messageview_return_to_list_label">Volver a la lista después de borrar</string>
    <string name="global_settings_messageview_return_to_list_summary">Volver a la lista después de la acción de borrado</string>
-    <!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
-    <!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
+    <string name="global_settings_messageview_show_next_label">Mostrar siguiente mensaje tras borrado</string>
+    <string name="global_settings_messageview_show_next_summary">Mostrar por defecto siguiente mensaje tras el borrado</string>

    <string name="global_settings_confirm_actions_title">Confirmar acción</string>
    <string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string>
    <string name="global_settings_confirm_action_archive">Archivar</string>
    <string name="global_settings_confirm_action_delete">Borrar (Mensajes en la vista)</string>
+    <string name="global_settings_confirm_action_delete_starred">Borrar destacado (sólo vista mensaje)</string>
    <string name="global_settings_confirm_action_spam">Spam</string>
-    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
+    <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos como leídos</string>
    <string name="global_settings_confirm_action_send">Enviados</string>

    <string name="global_settings_privacy_mode_title">Bloquear notificaciones</string>
    <string name="global_settings_privacy_mode_summary">No mostrar asunto del mensaje en la barra de notificaciones cuando el sistema está bloqueado.</string>

-    <string name="quiet_time">Tiempo de Silencio</string>
+    <!-- NEW: <string name="global_settings_batch_buttons">Batch buttons</string>-->
+    <!-- NEW: <string name="global_settings_batch_buttons_summary">Configure message list batch buttons</string>-->
+    <!-- NEW: <string name="global_settings_mark_read">Mark read/unread</string>-->
+    <!-- NEW: <string name="global_settings_delete">Delete</string>-->
+    <!-- NEW: <string name="global_settings_archive">Move to archive</string>-->
+    <!-- NEW: <string name="global_settings_archive_disabled_reason">No archive folders.</string>-->
+    <!-- NEW: <string name="global_settings_move">Move</string>-->
+    <!-- NEW: <string name="global_settings_flag">Flag</string>-->
+    <!-- NEW: <string name="global_settings_unselect">Unselect</string>-->
+
+    <string name="quiet_time">Horario de Silencio</string>
    <string name="quiet_time_description">Desactivar sonidos, alertas y luces por la noche</string>
    <string name="quiet_time_starts">Silencio comienza</string>
    <string name="quiet_time_ends">Silencio termina</string>
@ -370,12 +387,12 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_setup_check_settings_finishing_msg">Finalizando\u2026</string>
    <string name="account_setup_check_settings_canceling_msg">Cancelando\u2026</string>

-    <string name="account_setup_names_title">Hecho!</string>
+    <string name="account_setup_names_title">¡Hecho!</string>
    <string name="account_setup_names_instructions">Tu cuenta está configurada!</string>
    <string name="account_setup_names_account_name_label">De un nombre a esta cuenta (opcional):</string>
-    <string name="account_setup_names_user_name_label">Introduzca su nombre (se visualizará en el mensaje de salida):</string>
+    <string name="account_setup_names_user_name_label">Introduzca su nombre (se verá en el mensaje de salida):</string>

-    <string name="account_setup_finished_toast">Su cuenta está configurada!\n\nObteniendo correo\u2026</string>
+    <string name="account_setup_finished_toast">¡Su cuenta está configurada!\n\nObteniendo correo\u2026</string>

    <string name="account_setup_account_type_title">Tipo de cuenta</string>
    <string name="account_setup_account_type_instructions">¿Qué tipo de cuenta es?</string>
@ -400,7 +417,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa

    <string name="account_setup_incoming_delete_policy_label">Borrado de mesajes</string>
    <string name="account_setup_incoming_delete_policy_never_label">No borrar del servidor</string>
-    <string name="account_setup_incoming_delete_policy_7days_label">Después de 7 dias</string>
+    <string name="account_setup_incoming_delete_policy_7days_label">Pasado 7 días</string>
    <string name="account_setup_incoming_delete_policy_delete_label">Borrar del servidor</string>
    <string name="account_setup_incoming_delete_policy_markread_label">Marcar como leído en servidor</string>

@ -409,20 +426,20 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
    <string name="account_setup_incoming_other_label">Otras</string>

-    <string name="account_setup_incoming_save_all_headers_title">Descargar encabezados</string>
-    <string name="account_setup_incoming_save_all_headers_label">Guardar todos los encabezados localmente</string>
+    <string name="account_setup_incoming_save_all_headers_title">Descargar cabeceras</string>
+    <string name="account_setup_incoming_save_all_headers_label">Guardar todas las cabeceras localmente</string>

    <string name="local_storage_provider_external_label">Almacenamiento externo (SD)</string>
    <string name="local_storage_provider_internal_label">Almacenamiento interno</string>
    <string name="local_storage_provider_samsunggalaxy_label">%1$s almacenamiento interno adicional</string>
-    <string name="local_storage_provider_label">Ubicación del almacenamiento</string>
+    <string name="local_storage_provider_label">Ubicación del almacén</string>

-    <string name="account_setup_expunge_policy_label">Erradicar borrados</string>
+    <string name="account_setup_expunge_policy_label">Elininar borrados</string>
    <string name="account_setup_expunge_policy_immediately">Inmediatamente</string>
    <string name="account_setup_expunge_policy_on_poll">Durante comprobación</string>
    <string name="account_setup_expunge_policy_manual">Sólo manualmente</string>

-    <!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>-->
+    <string name="account_setup_incoming_autodetect_namespace_label">Autodetectar nombre IMAP</string>
    <string name="account_setup_incoming_imap_path_prefix_label">Prefijo de la Dirección IMAP</string>

    <string name="drafts_folder_label">Carpeta Borradores</string>
@ -431,7 +448,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="archive_folder_label">Carpeta Archivados</string>
    <string name="spam_folder_label">Carpeta SPAM</string>

-    <string name="account_setup_incoming_subscribed_folders_only_label">Ver sólo carpteas suscritas</string>
+    <string name="account_setup_incoming_subscribed_folders_only_label">Ver sólo carpetas suscritas</string>
    <string name="account_setup_auto_expand_folder">Autoexpandir carpeta</string>

    <string name="account_setup_incoming_webdav_path_prefix_label">Dirección WebDAV (Exchange)</string>
@ -467,10 +484,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_setup_options_title">Opciones de cuenta</string>

    <string name="compact_action">Compactar</string>
-    <string name="clear_action">Limpiar mensajes (peligroso!)</string>
-    <string name="recreate_action">Reconstruir mensajes (última opción!)</string>
+    <string name="clear_action">Limpiar mensajes (¡peligroso!)</string>
+    <string name="recreate_action">Reconstruir mensajes (¡última opción!)</string>

-    <string name="account_setup_options_mail_check_frequency_label">Frecuencia de comprobación de correo</string>
+    <string name="account_setup_options_mail_check_frequency_label">Cuando comprobar nuevo correo</string>
    <!-- Frequency also used in account_settings_* -->
    <string name="account_setup_options_mail_check_frequency_never">Nunca</string>
    <string name="account_setup_options_mail_check_frequency_1min">Cada minuto</string>
@ -486,8 +503,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_setup_options_mail_check_frequency_24hour">Cada 24 horas</string>

    <string name="push_poll_on_connect_label">Comprobar automáticamente</string>
-    <string name="account_setup_options_enable_push_label">Activar subscripción para esta cuenta</string>
-    <string name="account_setup_options_enable_push_summary">Si se soporta por su servidor, los mensajes aparecerán de forma instantanea. Esta opción puede hacer más lento el sistema</string>
+    <string name="account_setup_options_enable_push_label">Activar suscripción para esta cuenta</string>
+    <string name="account_setup_options_enable_push_summary">Si lo permite su servidor, los mensajes aparecerán de forma instantánea. Esta opción puede ralentizar el sistema</string>
    <string name="idle_refresh_period_label">Refrescar conexión</string>
    <string name="idle_refresh_period_1min">Cada minuto</string>
    <string name="idle_refresh_period_2min">Cada 2 minutos</string>
@ -499,8 +516,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="idle_refresh_period_48min">Cada 48 minutos</string>
    <string name="idle_refresh_period_60min">Cada 60 minutos</string>

-    <string name="account_setup_options_default_label">Enviar correos desde esta cuenta por defecto</string>
-    <string name="account_setup_options_notify_label">Avisarme cuando llegue correo</string>
+    <string name="account_setup_options_default_label">Enviar mensajes desde esta cuenta por defecto</string>
+    <string name="account_setup_options_notify_label">Avisarme cuando lleguen mensajes</string>
    <string name="account_setup_options_notify_sync_label">Avisarme cuando se compruebe el correo</string>

    <!-- Number of displayed messages, also used in account_settings_* -->
@ -514,11 +531,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_setup_options_mail_display_count_1000">1000 mensajes</string>
    <string name="account_setup_options_mail_display_count_all">Todos los mensajes</string>

-    <string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje que no ha sido sincronizado con el servidor</string>
+    <string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje no sincronizado con el servidor</string>

    <string name="account_setup_failed_dlg_title">No se ha podido finalizar la Configuración</string>
    <string name="account_setup_failed_dlg_auth_message_fmt">Usuario o contraseña incorrectas.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Username or password incorrect\n(ERR01 Account does not exist) -->
-    <string name="account_setup_failed_dlg_certificate_message_fmt">No se puede conectar de forma segura con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) -->
+    <string name="account_setup_failed_dlg_certificate_message_fmt">No se puede conectar de forma segura con el servidor. Certificado inválido\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot safely connect to server\n(Invalid certificate) -->
    <string name="account_setup_failed_dlg_server_message_fmt">No se puede conectar con el servidor.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Cannot connect to server\n(Connection timed out) -->
    <string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string>
    <string name="account_setup_failed_dlg_continue_action">Continuar</string>
@ -527,19 +544,21 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_title_fmt">Configuración de cuenta</string>
    <string name="account_settings_default">Cuenta por defecto</string>
    <string name="account_settings_default_label">Cuenta por defecto</string>
-    <string name="account_settings_default_summary">Enviar correo desde esta cuenta por defecto</string>
-    <string name="account_settings_notify_label">Notificar correo nuevo</string>
+    <string name="account_settings_default_summary">Enviar mensajes desde esta cuenta por defecto</string>
+    <string name="account_settings_notify_label">Notificar mensajes nuevos</string>
    <string name="account_settings_notify_sync_label">Notificar sincronización</string>
    <string name="account_settings_email_label">Tu Dirección de correo</string>
-    <string name="account_settings_notify_summary">Avisarme en el estatus cuando llegue correo nuevo</string>
-    <string name="account_settings_notify_sync_summary">Avisarme en el estatus cuando se compruebe el correo</string>
+    <string name="account_settings_notify_summary">Avisar cuando llegue correo nuevo</string>
+    <string name="account_settings_notify_sync_summary">Avisar cuando se compruebe el correo</string>
    <string name="account_settings_show_combined_label">Mostrar bandejas de entradas combinadas</string>
    <string name="account_settings_notify_self_label">Incluir bandeja de salida</string>
    <string name="account_settings_notify_self_summary">Mostrar notificaciones durante el envío de correo</string>
    <string name="account_settings_notification_opens_unread_label">Abrir correo no leído</string>
    <string name="account_settings_notification_opens_unread_summary">Abrir correo no leído desde la notificación</string>
-    <string name="account_settings_notification_unread_count_label">Mostrar contador de correos sin leer</string>
-    <string name="account_settings_notification_unread_count_summary">Mostrar el número de mensajes sin leer en la barra de notificaciones.</string>
+    <string name="account_settings_notification_unread_count_label">Mostrar número de mensajes no leídos</string>
+    <string name="account_settings_notification_unread_count_summary">Mostrar número de mensajes no leídos en barra de notificaciones.</string>
+    <string name="account_settings_mark_message_as_read_on_view_label">Marcar mensaje como leído tras abrirlo</string>
+    <string name="account_settings_mark_message_as_read_on_view_summary">Marcar mensaje como leído cuando se abre para verlo</string>

    <string name="account_settings_enable_move_buttons_label">Habilitar botones de copia</string>
    <string name="account_settings_enable_move_buttons_summary">Mostrar botones de archivar, mover y SPAM</string>
@ -551,18 +570,22 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa

    <string name="account_settings_composition">Configuración Saliente</string>

-    <!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
-    <!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
+    <string name="account_settings_default_quoted_text_shown_label">Citar mensaje original al responder</string>
+    <string name="account_settings_default_quoted_text_shown_summary">Al responder los mensajes, el mensaje original se incluirá en tu respuesta.</string>

    <string name="account_settings_reply_after_quote_label">Respuesta tras cita</string>
-    <string name="account_settings_reply_after_quote_summary">Cuando se responda a un correo, el texto original estará por encima de su respuesta</string>
+    <string name="account_settings_reply_after_quote_summary">Al responder un mensaje, el texto original estará por encima de su respuesta</string>
+
+    <string name="account_settings_strip_signature_label">Eliminar firma del texto citado</string>
+    <string name="account_settings_strip_signature_summary">Al responder los mensajes, la firma del texto citado será eliminada</string>

    <string name="account_settings_message_format_label">Formato del mensaje</string>
-    <string name="account_settings_message_format_text">Texto plano (se quitan las imágenes y el formato)</string>
+    <string name="account_settings_message_format_text">Texto simple (se quitan las imágenes y el formato)</string>
    <string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string>
+    <string name="account_settings_message_format_auto">Automática (texto simple excepto si se responde a un mensaje HTML)</string>

-    <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
-    <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
+    <string name="account_settings_message_read_receipt_label">Leer acuse de lectura</string>
+    <string name="account_settings_message_read_receipt_summary">Solicitar siempre un acuse de Lectura</string>

    <string name="account_settings_quote_style_label">Estilo de cita al responder</string>
    <string name="account_settings_quote_style_prefix">Prefijo (como Gmail, Pine)</string>
@ -581,6 +604,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_crypto_app_not_available">No disponible</string>
    <string name="account_settings_crypto_auto_signature">Firmar automáticamente</string>
    <string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma</string>
+    <string name="account_settings_crypto_auto_encrypt">Auto-encriptado</string>
+    <string name="account_settings_crypto_auto_encrypt_summary">Encripta automáticamente si la clave pública es compatible.</string>

    <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
    <string name="account_settings_second_class_check_frequency_label">Frecuencia de 2a clase</string>
@ -591,11 +616,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_color_summary">Seleccione el color a utilizar en la carpeta y en la cuenta</string>

    <string name="account_settings_led_color_label">Color de aviso</string>
-    <string name="account_settings_led_color_summary">Seleccione el color del LED cuando haya un aviso para esta cuenta</string>
+    <string name="account_settings_led_color_summary">Seleccione el color del LED para los avisos de esta cuenta</string>

    <string name="account_settings_mail_display_count_label">Tamaño carpeta local</string>

-    <string name="account_settings_autodownload_message_size_label">Obtener mensajes hasta</string>
+    <string name="account_settings_autodownload_message_size_label">Obtener mensajes con hasta</string>
    <string name="account_settings_autodownload_message_size_1">1Kb</string>
    <string name="account_settings_autodownload_message_size_2">2Kb</string>
    <string name="account_settings_autodownload_message_size_4">4Kb</string>
@ -610,7 +635,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
    <string name="account_settings_autodownload_message_size_5120">5Mb</string>
    <string name="account_settings_autodownload_message_size_10240">10Mb</string>
-    <string name="account_settings_autodownload_message_size_any">cualquier tamaño (sin límite)</string>
+    <string name="account_settings_autodownload_message_size_any">completo (sin límite)</string>

    <string name="account_settings_message_age_label">Sincronizar desde</string>
    <string name="account_settings_message_age_any">Sin fecha (sin límite)</string>
@ -639,7 +664,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_folder_sync_mode_not_second_class">Todas excepto las de 2a clase</string>
    <string name="account_settings_folder_sync_mode_none">Ninguna</string>

-    <string name="account_settings_folder_push_mode_label">Subscripción de carpetas</string>
+    <string name="account_settings_folder_push_mode_label">Suscripción de carpetas</string>
    <string name="account_settings_folder_push_mode_all">Todas</string>
    <string name="account_settings_folder_push_mode_first_class">Sólo 1a clase</string>
    <string name="account_settings_folder_push_mode_first_and_second_class">1a y 2a Clase</string>
@ -671,7 +696,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="folder_settings_folder_sync_mode_second_class">2a Clase</string>
    <string name="folder_settings_folder_sync_mode_inherited">La misma que la de visualización</string>

-    <string name="folder_settings_folder_push_mode_label">Clase en subscripción</string>
+    <string name="folder_settings_folder_push_mode_label">Clase en suscripción</string>
    <string name="folder_settings_folder_push_mode_normal">Ninguna</string>
    <string name="folder_settings_folder_push_mode_first_class">1a Clase</string>
    <string name="folder_settings_folder_push_mode_second_class">2a Clase</string>
@ -740,7 +765,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="account_settings_signature_label">Firma</string>
    <string name="account_settings_signature_summary">Añadir firma a cada mensaje que envias</string>

-    <string name="default_signature">-- \nEnviado desde mi teléfono Android con K-9 Mail. Disculpa mi brevedad</string>
+    <string name="default_signature">-- \nEnviado desde mi teléfono con K-9 Mail.</string>
    <string name="default_identity_description">Identidad principal</string>
    <string name="choose_identity">Seleccionar identidad</string>
    <string name="choose_identity_title">Seleccionar identidad</string>
@ -765,8 +790,9 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="sort_attach_first">Con adjuntos primero</string>
    <string name="sort_unattached_first">Sin adjuntos primero</string>

-    <string name="sort_by">Ordenado por...</string>
+    <string name="sort_by">Ordenado por…</string>
    <string name="sort_by_date">Fecha</string>
+    <string name="sort_by_arrival">Llegada</string>
    <string name="sort_by_sender">Remitente</string>
    <string name="sort_by_subject">Asunto</string>
    <string name="sort_by_flag">Estrellas</string>
@ -787,10 +813,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
        Si no puede acceder con su contraseña y usuario y no tiene una cuenta de pago.
        Es posible que pueda acceder sólo via web.</string>
    <string name="provider_note_yahoojp">Si quiere utilizar el correo POP3 para este proveedor debe activar este acceso en la Configuración de yahoo.</string>
-    <!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
-    <!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
-    <!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
-    <!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
+    <string name="provider_note_auonejp">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo au one.</string>
+    <string name="provider_note_naver">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Naver.</string>
+    <string name="provider_note_hanmail">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Hanmail(Daum).</string>
+    <string name="provider_note_paran">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Paran.</string>
+    <string name="provider_note_nate">Si quiere usar IMAP o POP3 con este proveedor, debe autorizar el uso de IMAP o POP3 en la página de configuración de correo Nate.</string>

    <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string>
    <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
@ -813,13 +840,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    Q - Volver a cuentas\u000A
    S - Editar preferencias cuenta</string>

+    <string name="folder_list_filter_hint">nombre carpeta contiene</string>
+
    <string name="folder_list_display_mode_label">Carpetas</string>
    <string name="folder_list_display_mode_all">Ver todas las carpetas</string>
    <string name="folder_list_display_mode_first_class">Ver sólo carpetas de 1a Clase</string>
    <string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a y 2a Clase</string>
    <string name="folder_list_display_mode_not_second_class">Ver todas excepto las de 2a Clase</string>

-    <string name="account_settings_signature__location_label">Posición de la Frima</string>
+    <string name="account_settings_signature__location_label">Posición de la Firma</string>
    <string name="account_settings_signature__location_before_quoted_text">Antes del texto citado</string>
    <string name="account_settings_signature__location_after_quoted_text">Después del texto citado</string>
    <string name="setting_theme_dark">Oscuro</string>
@ -832,12 +861,12 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="interaction_preferences">Interacción</string>
    <string name="accountlist_preferences">Lista de cuentas</string>
    <string name="messagelist_preferences">Lista de mensajes</string>
-    <string name="messageview_preferences">mensajes</string>
+    <string name="messageview_preferences">Mensajes</string>
    <string name="settings_theme_label">Tema</string>
    <string name="settings_language_label">Idioma</string>

-    <string name="settings_messageview_mobile_layout_label">Columna única</string>
-    <string name="settings_messageview_mobile_layout_summary">Reformatea mensajes HTML para pantallas pequeñas</string>
+    <string name="settings_messageview_mobile_layout_label">Única Columna</string>
+    <string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string>
    <string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string>
    <string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string>

@ -858,10 +887,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    -->
    <string name="date_format_short">SHORT</string>
    <string name="date_format_medium">MEDIUM</string>
-    <string name="date_format_common">dd-MMM-yyyy</string>
+    <string name="date_format_common">dd-MM-yyyy</string>
    <string name="date_format_iso8601">yyyy-MM-dd</string>

-    <string name="batch_ops">Operaciones en lote</string>
+    <string name="batch_ops">Operaciones por Lotes</string>
    <string name="batch_delete_op">Borrar seleccionados</string>
    <string name="batch_mark_read_op">Marcar seleccionados como leídos</string>
    <string name="batch_mark_unread_op">Marcar seleccionados como no leídos</string>
@ -892,7 +921,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="gestures_summary">Aceptar controles gestuales</string>

    <string name="compact_layouts_title">Disposición compacta</string>
-    <string name="compact_layouts_summary">Ajustar disposición para mostrar más en cada página</string>
+    <string name="compact_layouts_summary">Ajustar disposición para mostrar más mensajes en cada página</string>

    <string name="volume_navigation_title">Navegación con teclas de volumen</string>
    <string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string>
@ -900,10 +929,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="volume_navigation_list">Listas de mensajes</string>

    <string name="manage_back_title">Controlar botón \"Atras\" </string>
-    <string name="manage_back_summary">Hacer \"Atras\" siempre un nivel superior</string>
+    <string name="manage_back_summary">Ir \"Atras\" hacia un nivel superior</string>

-    <string name="start_integrated_inbox_title">Iniciar en Bandeja unificada</string>
-    <string name="start_integrated_inbox_summary">Mostrar la Bandeja de Entrada unificada al inicio</string>
+    <string name="start_integrated_inbox_title">Usar Bandeja Unificada</string>
+    <string name="start_integrated_inbox_summary">Mostrar una Bandeja de Entrada unificada al inicio</string>

    <string name="measure_accounts_title">Tamaño cuenta</string>
    <string name="measure_accounts_summary">Desactivar para mejorar rendimiento</string>
@ -911,8 +940,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="count_search_title">Mostrar contador de búsqueda</string>
    <string name="count_search_summary">Desactivar para mejorar rendimiento</string>

-    <!-- NEW: <string name="hide_special_accounts_title">Hide special accounts</string>-->
-    <!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>-->
+    <string name="hide_special_accounts_title">Esconder cuentas especiales</string>
+    <string name="hide_special_accounts_summary">Esconder la cuenta unificada y todas las cuentas</string>

    <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
    <string name="flagged_modifier"> - Estrellas</string>
@ -964,15 +993,18 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="font_size_message_view_date">Fecha</string>
    <string name="font_size_message_view_content">Cuerpo de mensaje</string>

-    <string name="font_size_tiniest">Muy delgada</string>
-    <string name="font_size_tiny">Delgada</string>
-    <string name="font_size_smaller">Muy pequeña</string>
+    <string name="font_size_message_compose">Composición Mensaje</string>
+    <string name="font_size_message_compose_input">Campos Entrada Texto</string>
+
+    <string name="font_size_tiniest">La más pequeña</string>
+    <string name="font_size_tiny">Muy pequeña</string>
+    <string name="font_size_smaller">Más pequeña</string>
    <string name="font_size_small">Pequeña</string>
    <string name="font_size_medium">Mediana</string>
    <string name="font_size_large">Grande</string>
    <string name="font_size_larger">Muy Grande</string>

-    <string name="font_size_webview_smaller">Muy pequeña</string>
+    <string name="font_size_webview_smaller">Más pequeña</string>
    <string name="font_size_webview_small">Pequeña</string>
    <string name="font_size_webview_normal">Normal</string>
    <string name="font_size_webview_large">Grande</string>
@ -1005,6 +1037,15 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="save_or_discard_draft_message_dlg_title">¿Guardar como borrador?</string>
    <string name="save_or_discard_draft_message_instructions_fmt">¿Guardar o descartar este mensaje?</string>

+    <string name="confirm_discard_draft_message_title">¿Desechar mensaje?</string>
+    <string name="confirm_discard_draft_message">¿Está seguro de desechar este mensaje?</string>
+
+    <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Rehusar guardar mensaje borrador.</string>
+    <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rehusar guardar mensaje borrador marcado como encriptado.</string>
+
+    <string name="continue_without_public_key_dlg_title">¿Continuar sin clave pública?</string>
+    <string name="continue_without_public_key_instructions_fmt">Uno o más recipientes no tienen clave pública. ¿Continuar?</string>
+
    <string name="charset_not_found">Este mensaje no puede visualizarse porque el tipo de caracteres \"<xliff:g id="charset">%s</xliff:g>\" no ha sido encontrado.</string>

    <string name="select_text_now">Seleccionar texto a copiar.</string>
@ -1014,23 +1055,13 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="dialog_confirm_delete_confirm_button">Borrar</string>
    <string name="dialog_confirm_delete_cancel_button">No borrar</string>

-    <!-- NEW: <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>-->
-    <!-- NEW: <plurals name="dialog_confirm_spam_message">
-        <item quantity="one">Do you really want to move this message to the spam folder?</item>
-        <item quantity="other">Do you really want to move <xliff:g id="message_count">%1$d</xliff:g> messages to the spam folder?</item>
-
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
-    </plurals>-->
-    <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
-    <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->
+    <string name="dialog_confirm_spam_title">Confirmar mover a la carpeta spam</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">¿Quiere mover este mensaje a la carpeta Spam?</item>
+        <item quantity="other">¿Quiere realmente mover <xliff:g id="message_count">%1$d</xliff:g> los mensajes a la carpeta Spam?</item>
+    </plurals>
+    <string name="dialog_confirm_spam_confirm_button">Si</string>
+    <string name="dialog_confirm_spam_cancel_button">No</string>

    <string name="dialog_attachment_progress_title">Descargando adjunto</string>

@ -1040,55 +1071,89 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
    <string name="messagelist_sent_cc_me_sigil">›</string>
    <string name="error_unable_to_connect">Imposible conectar.</string>

-    <!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>-->
-    <!-- NEW: <string name="settings_export_account">Export account settings</string>-->
-    <!-- NEW: <string name="settings_export_all">Export settings and accounts</string>-->
-    <!-- NEW: <string name="settings_import_dialog_title">Import</string>-->
-    <!-- NEW: <string name="settings_export_dialog_title">Export</string>-->
-    <!-- NEW: <string name="settings_import">Import settings</string>-->
-    <!-- NEW: <string name="settings_import_selection">Import selection</string>-->
-    <!-- NEW: <string name="settings_import_global_settings">Global settings</string>-->
-    <!-- NEW: <string name="settings_exporting">Exporting settings...</string>-->
-    <!-- NEW: <string name="settings_importing">Importing settings...</string>-->
-    <!-- NEW: <string name="settings_import_scanning_file">Scanning file...</string>-->
-    <!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <plurals name="settings_import_success">
-        <item quantity="one">1 account</item>
-        <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_export_failure">Failed to export settings</string>-->
-    <!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_export_success_header">Export succeeded</string>-->
-    <!-- NEW: <string name="settings_export_failed_header">Export failed</string>-->
-    <!-- NEW: <string name="settings_import_success_header">Import succeeded</string>-->
-    <!-- NEW: <string name="settings_import_failed_header">Import failed</string>-->
-    <!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>-->
-    <!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s.</xliff:g></string>-->
-    <!-- NEW: <plurals name="settings_import_server_passwords">
-        <item quantity="one">server password</item>
-        <item quantity="other">server passwords</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW: <plurals name="settings_import_setting_passwords">
-        <item quantity="one">Setting password...</item>
-        <item quantity="other">Setting passwords...</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>-->
-    <!-- NEW: <string name="activate_account_action">Activate</string>-->
+    <string name="import_export_action">Ajustes Importar &amp; Exportar</string>
+    <string name="settings_export_account">Exportar ajustes cuenta</string>
+    <string name="settings_export_all">Exportar ajustes y cuentas</string>
+    <string name="settings_import_dialog_title">Importar</string>
+    <string name="settings_export_dialog_title">Exportar</string>
+    <string name="settings_import">Importar ajustes</string>
+    <string name="settings_import_selection">Importar selección</string>
+    <string name="settings_import_global_settings">Ajustes globales</string>
+    <string name="settings_exporting">Exportando ajustes…</string>
+    <string name="settings_importing">Importando ajustes…</string>
+    <string name="settings_import_scanning_file">Buscando archivo…</string>
+    <string name="settings_export_success">Ajustes guardados en <xliff:g id="filename">%s</xliff:g></string>
+    <string name="settings_import_global_settings_success">Ajustes globales importados desde  <xliff:g id="filename">%s</xliff:g></string>
+    <string name="settings_import_success">Importado <xliff:g id="accounts">%s</xliff:g> desde <xliff:g id="filename">%s</xliff:g></string>
+    <plurals name="settings_import_success">
+        <item quantity="one">1 cuenta</item>
+        <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> cuentas</item>
+    </plurals>
+    <string name="settings_export_failure">Fallo al exportar los ajustes</string>
+    <string name="settings_import_failure">Fallo al importar cualquier ajuste desde <xliff:g id="filename">%s</xliff:g></string>
+    <string name="settings_export_success_header">Exportación correcta</string>
+    <string name="settings_export_failed_header">Exportación incorrecta</string>
+    <string name="settings_import_success_header">Importación correcta</string>
+    <string name="settings_import_failed_header">Importación incorrecta</string>
+    <string name="settings_import_activate_account_header">Activar cuenta</string>
+    <string name="settings_import_activate_account_intro">Para poder activar esta cuenta \"<xliff:g id="account">%s</xliff:g>\" debe proveer la <xliff:g id="server_passwords">%s.</xliff:g></string>
+    <plurals name="settings_import_server_passwords">
+        <item quantity="one">palabra clave del servidor</item>
+        <item quantity="other">palabras claves del servidor</item>
+    </plurals>
+    <string name="settings_import_incoming_server">Servidor Entrante (<xliff:g id="hostname">%s</xliff:g>):</string>
+    <string name="settings_import_outgoing_server">Servidor de Salida (<xliff:g id="hostname">%s</xliff:g>):</string>
+    <plurals name="settings_import_setting_passwords">
+        <item quantity="one">Definir password...</item>
+        <item quantity="other">Definir passwords...</item>
+    </plurals>
+    <string name="settings_import_use_incoming_server_password">Usar el password del Servidor Entrante</string>
+    <string name="activate_account_action">Activar</string>

    <!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>-->

-    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>-->
+    <string name="account_unavailable">Cuenta \"<xliff:g id="account">%s</xliff:g>\" no disponible; comprobar</string>

-    <!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
-    <!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
-    <!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
+    <string name="settings_attachment_default_path">Guardar adjuntos en…</string>
+    <string name="attachment_save_title">Guardar adjuntos</string>
+    <string name="attachment_save_desc">Explorador no encontrado. ¿Dónde quiere guardar este adjunto?</string>

-    <!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
-    <!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
-    <!-- NEW: <string name="manage_accounts_moving_message">Moving account...</string>-->
+    <string name="manage_accounts_move_up_action">Subir</string>
+    <string name="manage_accounts_move_down_action">Bajar</string>
+    <string name="manage_accounts_moving_message">Mover cuenta…</string>

+    <string name="unread_widget_label">Mensaje K-9 no leído</string>
+    <string name="unread_widget_select_account">Mostrar contador no leídos para…</string>
+
+    <string name="import_dialog_error_title">No existe Explorador de Archivos</string>
+    <string name="import_dialog_error_message">No hay una aplicación disponible importar el archivo. Por favor, instale un explorador de archivos desde Google Play</string>
+    <string name="open_market">Abrir Google Play</string>
+    <string name="close">Cerrar</string>
+
+    <!-- NEW: <string name="webview_empty_message">No text</string>-->
+
+    <string name="webview_contextmenu_link_view_action">Abrir para ver</string>
+    <string name="webview_contextmenu_link_share_action">Compartir enlace</string>
+    <string name="webview_contextmenu_link_copy_action">Copiar enlace portapapeles</string>
+    <string name="webview_contextmenu_link_clipboard_label">Enlace</string>
+
+    <string name="webview_contextmenu_image_title">Imagen</string>
+    <string name="webview_contextmenu_image_view_action">Ver imagen</string>
+    <string name="webview_contextmenu_image_save_action">Guardar imagen</string>
+    <string name="webview_contextmenu_image_download_action">Descargar imagen</string>
+    <string name="webview_contextmenu_image_copy_action">Copiar URL imagen al portapapeles</string>
+    <string name="webview_contextmenu_image_clipboard_label">URL de la imagen</string>
+
+    <string name="webview_contextmenu_phone_call_action">Número llamada</string>
+    <string name="webview_contextmenu_phone_save_action">Guardar en Contactos</string>
+    <string name="webview_contextmenu_phone_copy_action">Copiar Nº teléfono en el portapapeles</string>
+    <string name="webview_contextmenu_phone_clipboard_label">Número teléfono</string>
+
+    <string name="webview_contextmenu_email_send_action">Enviar mensaje</string>
+    <string name="webview_contextmenu_email_save_action">Guardar en Contactos</string>
+    <string name="webview_contextmenu_email_copy_action">Copiar dirección email en portapapeles</string>
+    <string name="webview_contextmenu_email_clipboard_label">Dirección Email</string>
+
+    <string name="image_saved_as">Imagen guardado como \"<xliff:g id="filename">%s</xliff:g>\"</string>
+    <string name="image_saving_failed">Error al guardar la imagen.</string>
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@ -229,8 +229,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
    <string name="debug_enable_sensitive_logging_title">Kirjoita lokiin arkaluontoisia tietoja</string>
    <string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string>

-    <string name="message_header_mua">K-9 Mail Androidille</string>
-
    <string name="combined_inbox_title">Kaikki postit</string>
    <string name="combined_inbox_label">Viimeisimmät viestit kaikilta tileiltä</string>
    <string name="combined_inbox_list_title">Saapuneet</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -256,8 +256,6 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
    <string name="debug_enable_sensitive_logging_title">Journaliser les informations personnelles</string>
    <string name="debug_enable_sensitive_logging_summary">Vos mots de passe pourront se retrouver dans le journal</string>

-    <string name="message_header_mua">K-9 Mail pour Android</string>
-
    <string name="combined_inbox_title">Tous les messages</string>
    <string name="combined_inbox_label">Messages récents de tous les comptes</string>
    <string name="combined_inbox_list_title">Toutes les boîtes de réception</string>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@ -231,8 +231,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
    <string name="debug_enable_sensitive_logging_title">Información sensible</string>
    <string name="debug_enable_sensitive_logging_summary">Deben amosarse chaves no log</string>

-    <string name="message_header_mua">K-9 Mail para Android</string>
-
    <string name="combined_inbox_title">Todos os correos</string>
    <string name="combined_inbox_label">Mensaxes recentes para todas as contas</string>
    <string name="combined_inbox_list_title">Todos os correos de Entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@ -189,7 +189,6 @@ Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot
    <string name="debug_enable_debug_logging_summary">Extra diagnosztikai naplózás</string>
    <string name="debug_enable_sensitive_logging_title">Személyes adatok naplózása</string>
    <string name="debug_enable_sensitive_logging_summary">Jelszavak naplózása</string>
-    <string name="message_header_mua">K-9 Levlező program Android rendszerhez</string>
    <string name="combined_inbox_title">Minden levél</string>
    <string name="combined_inbox_label">Legújabb üzenetek az összes fiókból</string>
    <string name="combined_inbox_list_title">Minden beérkezett üzenet</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -233,8 +233,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
    <string name="debug_enable_sensitive_logging_title">Registra informazioni sensibili</string>
    <string name="debug_enable_sensitive_logging_summary">Può mostrare le passwords nei files di logs.</string>

-    <string name="message_header_mua">K-9 Mail per Android</string>
-
    <string name="combined_inbox_title">Tutti i messaggi</string>
    <string name="combined_inbox_label">Messaggi recenti da tutti gli account</string>
    <string name="combined_inbox_list_title">Tutti i messaggi in arrivo</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@ -234,8 +234,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
    <string name="debug_enable_sensitive_logging_title">詳細情報ログ</string>
    <string name="debug_enable_sensitive_logging_summary">ログにパスワードが表示される</string>

-    <string name="message_header_mua">K-9 for Android </string>
-
    <string name="combined_inbox_title">すべてのメール</string>
    <string name="combined_inbox_label">全アカウントの最新メール</string>
    <string name="combined_inbox_list_title">受信トレイのすべてのメール</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -232,8 +232,6 @@ K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클
    <string name="debug_enable_sensitive_logging_title">중요 정보 기록</string>
    <string name="debug_enable_sensitive_logging_summary">로그에 비밀번호를 남길수도 있습니다.</string>

-    <string name="message_header_mua">안드로이드용 K-9 메일 </string>
-
    <string name="combined_inbox_title">모든 메일</string>
    <string name="combined_inbox_label">모든 계정의 모든 메시지</string>
    <string name="combined_inbox_list_title">받은편지함의 모든 메일</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@ -231,8 +231,6 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
    <string name="debug_enable_sensitive_logging_title">Log gevoelige informatie</string>
    <string name="debug_enable_sensitive_logging_summary">Kan wachtwoorden laten zien in logs.</string>

-    <string name="message_header_mua">K-9 Mail voor Android</string>
-
    <string name="combined_inbox_title">Alle Mail</string>
    <string name="combined_inbox_label">Recente berichten voor alle accounts</string>
    <string name="combined_inbox_list_title">Alle Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -16,8 +16,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">K-9 Mail</string>
    <string name="beta_app_name">K-9 Mail BETA</string>
-    <string name="app_authors">Google, The K-9 Dog Walkers.</string>
-    <!-- NEW: <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>-->
    <string name="app_license">Wszelkie prawa zastrzeżone</string>
    <string name="app_authors_fmt">Autorzy: <xliff:g id="app_authors">%s</xliff:g></string>
    <string name="app_revision_fmt">Historia zmian: <xliff:g id="app_revision_url">%s</xliff:g></string>
@ -244,8 +242,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="debug_enable_sensitive_logging_title">Loguj poufne informacje</string>
    <string name="debug_enable_sensitive_logging_summary">Logi mogą zawierać Twoje hasła</string>

-    <string name="message_header_mua">K-9 Mail</string>
-
    <string name="combined_inbox_title">Wszystkie wiadomości</string>
    <string name="combined_inbox_label">Ostatnie wiadomości ze wszystkich kont</string>
    <string name="combined_inbox_list_title">Wszystkie odebrane</string>
@ -309,7 +305,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="message_view_fetching_attachment_toast">Pobieram załącznik…</string>
    <string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
    <string name="message_view_download_remainder">Pobierz całą wiadomość</string>
-    <!-- NEW: <string name="message_view_downloading">Downloading…</string>-->
+    <string name="message_view_downloading">Pobieranie…</string>

    <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
    <string name="message_additional_headers_not_downloaded">Nie wszystkie nagłówki zostały pobrane lub zapisane. Wybierz \"Zapisuj nagłówki lokalnie\" w ustawieniach serwera poczty przychodzącej, aby tę funcje aktywować</string>
@ -781,7 +777,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="account_settings_signature_label">Sygnatura</string>
    <string name="account_settings_signature_summary">Dodawaj sygnaturę do każdej wysyłanej wiadomości</string>

-    <string name="default_signature">-- \nWysłane za pomocą mojego telefonu Android.</string>
+    <string name="default_signature">-- \nWysłane za pomocą K-9 Mail.</string>
    <string name="default_identity_description">Tożsamość domyślna</string>
    <string name="choose_identity">Wybierz tożsamość</string>
    <string name="choose_identity_title">Wybierz tożsamość</string>
@ -830,12 +826,12 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
        do swojego konta z użyciem poprawnego hasła i adresu email, najprawdopodobniej
        nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty
        korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string>
-    <string name="provider_note_yahoojp">Jeśli chcesz uzywać POP3 dla tego dostawcy, powinieneś zezwolić na użycie POP3 na stronie ustawień poczty Yahoo.</string>
-    <string name="provider_note_auonejp">Jeśli chcesz uzywać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Au one.</string>
-    <string name="provider_note_naver">Jeśli chcesz uzywać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Naver.</string>
-    <string name="provider_note_hanmail">Jeśli chcesz uzywać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Hanmail(Daum).</string>
-    <string name="provider_note_paran">Jeśli chcesz uzywać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień pocztyParan.</string>
-    <string name="provider_note_nate">Jeśli chcesz uzywać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Nate.</string>
+    <string name="provider_note_yahoojp">Jeśli chcesz używać POP3 dla tego dostawcy, powinieneś zezwolić na użycie POP3 na stronie ustawień poczty Yahoo.</string>
+    <string name="provider_note_auonejp">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Au one.</string>
+    <string name="provider_note_naver">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Naver.</string>
+    <string name="provider_note_hanmail">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Hanmail(Daum).</string>
+    <string name="provider_note_paran">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień pocztyParan.</string>
+    <string name="provider_note_nate">Jeśli chcesz używać IMAP lub POP3 dla tego dostawcy, powinieneś zezwolić na użycie IMAP lub POP3 na stronie ustawień poczty Nate.</string>

    <string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
    <string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
@ -868,6 +864,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
        I - Porządek sortowania\n
        Q - Widok folderów\n
        S - Zaznacz/odznacz\n
+        Z - Przełącz przeczytane/nieprzeczytane\n
+        / - Szukaj\n
+        5 - Sprawdź pocztę
    </string>

    <string name="folder_list_help_key">
@ -939,7 +938,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="batch_spam_op">Przenieś wybrane do Spamu</string>
    <string name="batch_move_op">Przenieś</string>
    <string name="batch_copy_op">Skopiuj</string>
-    <string name="batch_flag_mode">Star mode</string>
+    <string name="batch_flag_mode">Tryb gwiadzki</string>
    <string name="batch_select_mode">Tryb zaznaczania</string>
    <string name="batch_plain_mode">Tryb zwykły</string>
    <string name="batch_select_all">Zaznacz wszystko</string>
@ -1143,23 +1142,23 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="settings_import_incoming_server">Serwer przychodzący (<xliff:g id="hostname">%s</xliff:g>):</string>
    <string name="settings_import_outgoing_server">Serwer wychodzący (<xliff:g id="hostname">%s</xliff:g>):</string>
    <plurals name="settings_import_setting_passwords">
-        <item quantity="one">Ustawiam hasło...</item>
-        <item quantity="other">Ustawiam haseła...</item>
+        <item quantity="one">Ustawiam hasło…</item>
+        <item quantity="other">Ustawiam hasła…</item>
    </plurals>
    <string name="settings_import_use_incoming_server_password">Użyj hasła serwera przychodzącego</string>
    <string name="activate_account_action">Aktywuj</string>

    <string name="settings_unknown_version">Nie można użyć wersji <xliff:g id="version">%s</xliff:g></string>

-    <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź pamięc</string>
+    <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź pamięć</string>

    <string name="settings_attachment_default_path">Zapisuj załączniki do…</string>
    <string name="attachment_save_title">Zapisz załączniki</string>
    <string name="attachment_save_desc">Brak przeglądarki plików. Chcesz zapisać ten załącznik?</string>

-    <string name="manage_accounts_move_up_action">W górę</string>
-    <string name="manage_accounts_move_down_action">W dół</string>
-    <string name="manage_accounts_moving_message">przenoszenie konta…</string>
+    <string name="manage_accounts_move_up_action">Przenieś w górę</string>
+    <string name="manage_accounts_move_down_action">Przenieś w dół</string>
+    <string name="manage_accounts_moving_message">Przenoszenie konta…</string>

    <string name="unread_widget_label">K-9 Mail nieprzeczytane</string>
    <string name="unread_widget_select_account">Pokaż licznik nieprzeczytanych dla…</string>
@ -1169,7 +1168,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
    <string name="open_market">Otwórz Google Play</string>
    <string name="close">Zamknij</string>

-    <!-- NEW: <string name="webview_empty_message">No text</string>-->
+    <string name="webview_empty_message">Brak tekstu</string>

    <string name="webview_contextmenu_link_view_action">Otwórz podgląd</string>
    <string name="webview_contextmenu_link_share_action">Udostępnij link</string>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@ -229,8 +229,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
    <string name="debug_enable_sensitive_logging_title">Logar informações confidencias</string>
    <string name="debug_enable_sensitive_logging_summary">Talvez as senhas sejam mostradas nos logs.</string>

-    <string name="message_header_mua">K-9 Mail para Android</string>
-
    <string name="combined_inbox_title">Todos os e-mails</string>
    <string name="combined_inbox_label">Mensagens recentes de todas as contas</string>
    <string name="combined_inbox_list_title">Todos os e-mails da caixa de entrada</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -223,8 +223,6 @@
    <string name="debug_enable_sensitive_logging_title">Запись конфиденциальной информации</string>
    <string name="debug_enable_sensitive_logging_summary">Разрешает запись паролей в журнал</string>

-    <string name="message_header_mua">K-9 Mail для Android</string>
-
    <string name="combined_inbox_title">Вся почта</string>
    <string name="combined_inbox_label">Последние сообщения из всех почтовых ящиков</string>
    <string name="combined_inbox_list_title">Все Входящие Сообщения</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
@ -1034,7 +1032,7 @@
    <string name="error_unable_to_connect">Не получается соединиться.</string>

    <string name="import_export_action">Импорт и экспорт настроек</string>
-    
+
    <string name="settings_export_account">Экспортировать настройки учетной записи</string>
    <string name="settings_export_all">Экспортировать настройки и учетные записи</string>
    <string name="settings_import_dialog_title">Импорт</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@ -233,8 +233,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
    <string name="debug_enable_sensitive_logging_title">Logga känslig information</string>
    <string name="debug_enable_sensitive_logging_summary">Kan visa lösenord i loggarna.</string>

-    <string name="message_header_mua">K-9 E-post för Android</string>
-
    <string name="combined_inbox_title">All e-post</string>
    <string name="combined_inbox_label">Nya brev från alla konton</string>
    <string name="combined_inbox_list_title">Inkorg med alla nya brev</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -206,8 +206,6 @@
    <string name="debug_enable_sensitive_logging_title">Hassas bigi günlüğü tut</string>
    <string name="debug_enable_sensitive_logging_summary">Günlüklerde şifreler görünebilir.</string>

-    <string name="message_header_mua">Android için K-9 Posta</string>
-
    <string name="combined_inbox_title">Bütün Postalar</string>
    <string name="combined_inbox_label">Bütün hesaplardan gelen yeni mesajlar</string>
    <string name="combined_inbox_list_title">Gelen Kutusu bütün postaları</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@ -220,8 +220,6 @@
    <string name="debug_enable_sensitive_logging_title">记录敏感信息</string>
    <string name="debug_enable_sensitive_logging_summary">允许在日志中显示密码。</string>

-    <string name="message_header_mua">K-9 Mail for Android</string>
-
    <string name="combined_inbox_title">全部邮件</string>
    <string name="combined_inbox_label">全部账户的最近邮件</string>
    <string name="combined_inbox_list_title">全部邮件收件箱</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@ -223,8 +223,6 @@
    <string name="debug_enable_sensitive_logging_title">記錄敏感訊息</string>
    <string name="debug_enable_sensitive_logging_summary">允許在日誌中顯示密碼。</string>

-    <string name="message_header_mua">K-9 Mail for Android</string>
-
    <string name="combined_inbox_title">全部郵件</string>
    <string name="combined_inbox_label">全部帳戶的最近郵件</string>
    <string name="combined_inbox_list_title">全部郵件收件匣</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@ -466,26 +466,28 @@
    <string-array name="supported_languages">
        <item></item>
        <item>ca</item>
-        <item>cs</item>
        <item>da</item>
        <item>de</item>
        <item>en</item>
        <item>es</item>
-        <item>fr</item>
-        <item>fr_CA</item>
        <item>gl</item>
-        <item>it</item>
-        <item>ja</item>
        <item>hu</item>
        <item>nl</item>
-        <item>pl</item>
-        <item>pt_BR</item>
        <item>ru</item>
        <item>tr</item>
-        <item>zh_TW</item>
-        <item>zh_CN</item>
+        <item>fr</item>
+        <item>fr_CA</item>
+        <item>it</item>
+        <item>pl</item>
+        <item>pt_BR</item>
        <item>fi</item>
        <item>sv</item>
+        <item>cs</item>
+        <item>el</item>
+        <item>uk</item>
+        <item>zh_TW</item>
+        <item>zh_CN</item>
+        <item>ja</item>
        <item>ko</item>
    </string-array>

--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_revision_url">https://github.com/k9mail/k-9/wiki/ReleaseNotes</string>
    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <string name="message_header_mua">K-9 Mail for Android</string>
+
+    <!-- Licenses - translating legal stuff should be left to experts -->
+    <string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright © 2006–2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
 </resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -5,7 +5,6 @@
    <string name="app_authors">Google, The K-9 Dog Walkers.</string>
    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
    <string name="app_license">Licensed under the Apache License, Version 2.0.</string>
-    <string name="app_htmlcleaner_license">&lt;p>HtmlCleaner is distributed under BSD License. It gives the freedom for anyone to use, explore, modify, and distribute HtmlCleaner, but without any warranty.&lt;/p>&lt;p>Copyright (c) 2006-2011, HtmlCleaner team.&lt;br>All rights reserved.&lt;/p>&lt;p>Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:&lt;/p>&lt;p>&lt;ul>&lt;li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.&lt;/li>&lt;li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.&lt;/li>&lt;li>The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission.&lt;/li>&lt;/ul>&lt;/p>&lt;p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.&lt;/p></string>
    <string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
    <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
@ -232,7 +231,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
 \n * Message sorting
 \n * ...and more
 \n
-\nPlease note that K-9 does not support most free hotmail accounts and, like many mail clients, has some quirks when talking to Microsoft Exchange.
+\nPlease note that K-9 does not support most free Hotmail accounts and, like many mail clients, has some quirks when talking to Microsoft Exchange.
 \n
 \n Please submit bug reports, contribute new features and ask questions at http://k9mail.googlecode.com/

@ -244,8 +243,6 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
    <string name="debug_enable_sensitive_logging_title">Log sensitive information</string>
    <string name="debug_enable_sensitive_logging_summary">May show passwords in logs.</string>

-    <string name="message_header_mua">K-9 Mail for Android</string>
-
    <string name="combined_inbox_title">All Mail</string>
    <string name="combined_inbox_label">Recent messages from all accounts</string>
    <string name="combined_inbox_list_title">All Mail Inbox</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
@ -379,7 +376,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
    <string name="global_settings_move">Move</string>
    <string name="global_settings_flag">Flag</string>
    <string name="global_settings_unselect">Unselect</string>
-	
+
    <string name="quiet_time">Quiet Time</string>
    <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>
    <string name="quiet_time_starts">Quiet Time starts</string>
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@ -988,6 +988,14 @@ public class Account implements BaseAccount {
        mDraftsFolderName = draftsFolderName;
    }

+    /**
+     * Checks if this account has a drafts folder set.
+     * @return true if account has a drafts folder set.
+     */
+    public synchronized boolean hasDraftsFolder() {
+        return !K9.FOLDER_NONE.equalsIgnoreCase(mDraftsFolderName);
+    }
+
    public synchronized String getSentFolderName() {
        return mSentFolderName;
    }
@ -1000,6 +1008,15 @@ public class Account implements BaseAccount {
        mSentFolderName = sentFolderName;
    }

+    /**
+     * Checks if this account has a sent folder set.
+     * @return true if account has a sent folder set.
+     */
+    public synchronized boolean hasSentFolder() {
+        return !K9.FOLDER_NONE.equalsIgnoreCase(mSentFolderName);
+    }
+
+
    public synchronized String getTrashFolderName() {
        return mTrashFolderName;
    }
@ -1028,6 +1045,14 @@ Log.d("ASH", "setTrashFolderName() attempting change of folder.setLocalOnly()");
        }
    }

+    /**
+     * Checks if this account has a trash folder set.
+     * @return true if account has a trash folder set.
+     */
+    public synchronized boolean hasTrashFolder() {
+        return !K9.FOLDER_NONE.equalsIgnoreCase(mTrashFolderName);
+    }
+
    public synchronized String getArchiveFolderName() {
        return mArchiveFolderName;
    }
@ -1052,6 +1077,14 @@ Log.d("ASH", "setTrashFolderName() attempting change of folder.setLocalOnly()");
        mSpamFolderName = spamFolderName;
    }

+    /**
+     * Checks if this account has a spam folder set.
+     * @return true if account has a spam folder set.
+     */
+    public synchronized boolean hasSpamFolder() {
+        return !K9.FOLDER_NONE.equalsIgnoreCase(mSpamFolderName);
+    }
+
    public synchronized String getOutboxFolderName() {
        return OUTBOX;
    }
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@ -97,34 +97,53 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {

        this.status = truncateStatus(folder.getStatus());

-        if (this.name.equalsIgnoreCase(account.getInboxFolderName())) {
-            this.displayName = context.getString(R.string.special_mailbox_name_inbox);
+        this.displayName = getDisplayName(context, folder);
+    }
+
+    /**
+     * Returns the display name for a folder.
+     *
+     * <p>
+     * This will return localized strings for special folders like the Inbox or the Trash folder.
+     * </p>
+     *
+     * @param context
+     *         A {@link Context} instance that is used to get the string resources.
+     * @param folder
+     *         The {@link Folder} instance for which to return the display name.
+     *
+     * @return The localized name for the provided folder if it's a special folder or the original
+     *         folder name if it's a non-special folder.
+     */
+    public static String getDisplayName(Context context, Folder folder) {
+        Account account = folder.getAccount();
+        String name = folder.getName();
+
+        final String displayName;
+        if (name.equals(account.getSpamFolderName())) {
+            displayName = String.format(
+                    context.getString(R.string.special_mailbox_name_spam_fmt), name);
+        } else if (name.equals(account.getArchiveFolderName())) {
+            displayName = String.format(
+                    context.getString(R.string.special_mailbox_name_archive_fmt), name);
+        } else if (name.equals(account.getSentFolderName())) {
+            displayName = String.format(
+                    context.getString(R.string.special_mailbox_name_sent_fmt), name);
+        } else if (name.equals(account.getTrashFolderName())) {
+            displayName = String.format(
+                    context.getString(R.string.special_mailbox_name_trash_fmt), name);
+        } else if (name.equals(account.getDraftsFolderName())) {
+            displayName = String.format(
+                    context.getString(R.string.special_mailbox_name_drafts_fmt), name);
+        } else if (name.equals(account.getOutboxFolderName())) {
+            displayName = context.getString(R.string.special_mailbox_name_outbox);
+        // FIXME: We really shouldn't do a case-insensitive comparison here
+        } else if (name.equalsIgnoreCase(account.getInboxFolderName())) {
+            displayName = context.getString(R.string.special_mailbox_name_inbox);
        } else {
-            this.displayName = folder.getName();
+            displayName = name;
        }

-        if (this.name.equals(account.getOutboxFolderName())) {
-            this.displayName = context.getString(R.string.special_mailbox_name_outbox);
-        }
-
-        if (this.name.equals(account.getDraftsFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_drafts_fmt), this.name);
-        }
-
-        if (this.name.equals(account.getTrashFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_trash_fmt), this.name);
-        }
-
-        if (this.name.equals(account.getSentFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_sent_fmt), this.name);
-        }
-
-        if (this.name.equals(account.getArchiveFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_archive_fmt), this.name);
-        }
-
-        if (this.name.equals(account.getSpamFolderName())) {
-            this.displayName = String.format(context.getString(R.string.special_mailbox_name_spam_fmt), this.name);
-        }
+        return displayName;
    }
 }
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@ -1550,7 +1550,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc

    private void saveIfNeeded() {
        if (!mDraftNeedsSaving || mPreventDraftSaving || mPgpData.hasEncryptionKeys() ||
-                mEncryptCheckbox.isChecked() || isDraftsFolderDisabled()) {
+                mEncryptCheckbox.isChecked() || !mAccount.hasDraftsFolder()) {
            return;
        }

@ -2033,7 +2033,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
        getMenuInflater().inflate(R.menu.message_compose_option, menu);

        // Disable the 'Save' menu option if Drafts folder is set to -NONE-
-        if (isDraftsFolderDisabled()) {
+        if (!mAccount.hasDraftsFolder()) {
            menu.findItem(R.id.save).setEnabled(false);
        }

@ -2063,7 +2063,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
        if (mDraftNeedsSaving) {
            if (mEncryptCheckbox.isChecked()) {
                showDialog(DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED);
-            } else if (isDraftsFolderDisabled()) {
+            } else if (!mAccount.hasDraftsFolder()) {
                showDialog(DIALOG_CONFIRM_DISCARD_ON_BACK);
            } else {
                showDialog(DIALOG_SAVE_OR_DISCARD_DRAFT_MESSAGE);
@ -2078,10 +2078,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
        }
    }

-    private boolean isDraftsFolderDisabled() {
-        return mAccount.getDraftsFolderName().equals(K9.FOLDER_NONE);
-    }
-
    @Override
    public Dialog onCreateDialog(int id) {
        switch (id) {
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@ -1674,7 +1674,7 @@ public class MessageList
            if (!mAccount.hasArchiveFolder()) {
                menu.findItem(R.id.batch_archive_op).setVisible(false);
            }
-            if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) {
+            if (!mAccount.hasSpamFolder()) {
                menu.findItem(R.id.batch_spam_op).setVisible(false);
            }

@ -1886,7 +1886,7 @@ public class MessageList
            menu.findItem(R.id.archive).setVisible(false);
        }

-        if (K9.FOLDER_NONE.equalsIgnoreCase(account.getSpamFolderName())) {
+        if (!mAccount.hasSpamFolder()) {
            menu.findItem(R.id.spam).setVisible(false);
        }

--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@ -454,7 +454,8 @@ public class MessageView extends K9Activity implements OnClickListener {
                    !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName()));
            // Only enable the button if the Spam folder is not the current folder and not NONE.
            mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
-                    !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName()));
+                    //ASH !K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName()));
+                    mAccount.hasSpamFolder());
            mMove.setEnabled(true);
        } else {
            disableMoveButtons();
@ -864,7 +865,7 @@ public class MessageView extends K9Activity implements OnClickListener {
        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getArchiveFolderName())) {
            menu.findItem(R.id.archive).setVisible(false);
        }
-        if (K9.FOLDER_NONE.equalsIgnoreCase(mAccount.getSpamFolderName())) {
+        if (!mAccount.hasSpamFolder()) {
            menu.findItem(R.id.spam).setVisible(false);
        }
        try {
--- a/src/com/fsck/k9/activity/setup/FolderSettings.java
+++ b/src/com/fsck/k9/activity/setup/FolderSettings.java
@ -10,6 +10,7 @@ import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.util.Log;
 import com.fsck.k9.*;
+import com.fsck.k9.activity.FolderInfoHolder;
 import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.mail.Folder;
@ -80,8 +81,10 @@ public class FolderSettings extends K9PreferenceActivity {

        addPreferencesFromResource(R.xml.folder_settings_preferences);

+        //ASH Preference category = findPreference(PREFERENCE_TOP_CATERGORY);
        PreferenceCategory category = (PreferenceCategory)findPreference(PREFERENCE_TOP_CATERGORY);
-        category.setTitle(folderName);
+        String displayName = FolderInfoHolder.getDisplayName(this, mFolder);
+        category.setTitle(displayName); // ASH folderName


        mInTopGroup = (CheckBoxPreference)findPreference(PREFERENCE_IN_TOP_GROUP);
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@ -3345,9 +3345,9 @@ public class MessagingController implements Runnable {
                        for (MessagingListener l : getListeners()) {
                            l.synchronizeMailboxProgress(account, account.getSentFolderName(), progress, todo);
                        }
-                        if (K9.FOLDER_NONE.equals(account.getSentFolderName())) {
+                        if (!account.hasSentFolder()) {
                            if (K9.DEBUG)
-                                Log.i(K9.LOG_TAG, "Sent folder set to " + K9.FOLDER_NONE + ", deleting sent message");
+                                Log.i(K9.LOG_TAG, "Account does not have a sent mail folder; deleting sent message");
                            message.setFlag(Flag.DELETED, true);
                        } else {
                            LocalFolder localSentFolder = (LocalFolder) localStore.getFolder(account.getSentFolderName());
@ -3821,7 +3821,7 @@ public class MessagingController implements Runnable {
            LocalStore localStore = account.getLocalStore();
            localFolder = localStore.getFolder(folder);
            Map<String, String> uidMap = null;
-            if (folder.equals(account.getTrashFolderName()) || K9.FOLDER_NONE.equals(account.getTrashFolderName())) {
+            if (folder.equals(account.getTrashFolderName()) || !account.hasTrashFolder()) {
                if (K9.DEBUG)
                    Log.d(K9.LOG_TAG, "Deleting messages in trash folder or trash set to -None-, not copying");

--- a/src/com/fsck/k9/helper/HtmlConverter.java
+++ b/src/com/fsck/k9/helper/HtmlConverter.java
@ -190,6 +190,12 @@ public class HtmlConverter {
        return buff.toString();
    }

+    private static final String HTML_BLOCKQUOTE_COLOR_TOKEN = "$$COLOR$$";
+    private static final String HTML_BLOCKQUOTE_START = "<blockquote class=\"gmail_quote\" " +
+            "style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid $$COLOR$$; padding-left: 1ex;\">";
+    private static final String HTML_BLOCKQUOTE_END = "</blockquote>";
+    private static final String HTML_NEWLINE = "<br />";
+
    /**
     * Convert a text string into an HTML document.
     *
@ -217,14 +223,19 @@ public class HtmlConverter {
        }
        StringReader reader = new StringReader(text);
        StringBuilder buff = new StringBuilder(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH);
-        int c;
+        boolean isStartOfLine = false;  // Are we currently at the start of a line?
+        int quoteDepth = 0; // Number of DIVs deep we are.
+        int quotesThisLine = 0; // How deep we should be quoting for this line.
        try {
+            int c;
            while ((c = reader.read()) != -1) {
                switch (c) {
                case '\n':
                    // pine treats <br> as two newlines, but <br/> as one newline.  Use <br/> so our messages aren't
                    // doublespaced.
-                    buff.append("<br />");
+                    buff.append(HTML_NEWLINE);
+                    isStartOfLine = true;
+                    quotesThisLine = 0;
                    break;
                case '&':
                    buff.append("&amp;");
@ -233,11 +244,39 @@ public class HtmlConverter {
                    buff.append("&lt;");
                    break;
                case '>':
-                    buff.append("&gt;");
+                    if (isStartOfLine) {
+                        quotesThisLine++;
+                    } else {
+                        buff.append("&gt;");
+                    }
                    break;
                case '\r':
                    break;
+                case ' ':
+                    if (isStartOfLine) {
+                        // If we're still in the start of the line and we have spaces, don't output them, since they
+                        // may be collapsed by our div-converting magic.
+                        break;
+                    }
                default:
+                    if (isStartOfLine) {
+                        // Not a quote character and not a space.  Content is starting now.
+                        isStartOfLine = false;
+                        if (K9.DEBUG) {
+                            Log.d(K9.LOG_TAG, "currentQuoteDepth: " + quoteDepth + " quotesThisLine: " + quotesThisLine);
+                        }
+                        // Add/remove blockquotes by comparing this line's quotes to the previous line's quotes.
+                        if (quotesThisLine > quoteDepth) {
+                            for (int i = quoteDepth; i < quotesThisLine; i++) {
+                                buff.append(HTML_BLOCKQUOTE_START.replace(HTML_BLOCKQUOTE_COLOR_TOKEN, getQuoteColor(i + 1)));
+                            }
+                        } else if (quotesThisLine < quoteDepth) {
+                            for (int i = quoteDepth; i > quotesThisLine; i--) {
+                                buff.append(HTML_BLOCKQUOTE_END);
+                            }
+                        }
+                        quoteDepth = quotesThisLine;
+                    }
                    buff.append((char)c);
                }//switch
            }
@ -245,8 +284,21 @@ public class HtmlConverter {
            //Should never happen
            Log.e(K9.LOG_TAG, "Could not read string to convert text to HTML:", e);
        }
+        // Close off any quotes we may have opened.
+        if (quoteDepth > 0) {
+            for (int i = quoteDepth; i > 0; i--) {
+                buff.append(HTML_BLOCKQUOTE_END);
+            }
+        }
        text = buff.toString();

+        // Make newlines at the end of blockquotes nicer by putting newlines beyond the first one outside of the
+        // blockquote.
+        text = text.replaceAll(
+                   "\\Q" + HTML_NEWLINE + "\\E((\\Q" + HTML_NEWLINE + "\\E)+?)\\Q" + HTML_BLOCKQUOTE_END + "\\E",
+                   HTML_BLOCKQUOTE_END + "$1"
+               );
+
        // Replace lines of -,= or _ with horizontal rules
        text = text.replaceAll("\\s*([-=_]{30,}+)\\s*", "<hr />");

@ -275,6 +327,35 @@ public class HtmlConverter {
        return text;
    }

+    protected static final String QUOTE_COLOR_DEFAULT = "#ccc";
+    protected static final String QUOTE_COLOR_LEVEL_1 = "#729fcf";
+    protected static final String QUOTE_COLOR_LEVEL_2 = "#ad7fa8";
+    protected static final String QUOTE_COLOR_LEVEL_3 = "#8ae234";
+    protected static final String QUOTE_COLOR_LEVEL_4 = "#fcaf3e";
+    protected static final String QUOTE_COLOR_LEVEL_5 = "#e9b96e";
+
+    /**
+     * Return an HTML hex color string for a given quote level.
+     * @param level Quote level
+     * @return Hex color string with prepended #.
+     */
+    protected static String getQuoteColor(final int level) {
+        switch(level) {
+            case 1:
+                return QUOTE_COLOR_LEVEL_1;
+            case 2:
+                return QUOTE_COLOR_LEVEL_2;
+            case 3:
+                return QUOTE_COLOR_LEVEL_3;
+            case 4:
+                return QUOTE_COLOR_LEVEL_4;
+            case 5:
+                return QUOTE_COLOR_LEVEL_5;
+            default:
+                return QUOTE_COLOR_DEFAULT;
+        }
+    }
+
    /**
     * Searches for link-like text in a string and turn it into a link. Append the result to
     * <tt>outputBuffer</tt>. <tt>text</tt> is not modified.
@ -1168,7 +1249,7 @@ public class HtmlConverter {
        final String font = K9.messageViewFixedWidthFont()
                            ? "monospace"
                            : "sans-serif";
-        return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: " + font + "\">";
+        return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: " + font + "; margin-top: 0px\">";
    }

    private static String htmlifyMessageFooter() {
--- a/src/com/fsck/k9/mail/store/LockableDatabase.java
+++ b/src/com/fsck/k9/mail/store/LockableDatabase.java
@ -6,6 +6,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;

 import android.app.Application;
+import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
@ -370,12 +371,12 @@ public class LockableDatabase {
        try {
            final File databaseFile = prepareStorage(mStorageProviderId);
            try {
-                mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null);
+                mDb = application.openOrCreateDatabase(databaseFile.getPath(), Context.MODE_PRIVATE, null);
            } catch (SQLiteException e) {
                // try to gracefully handle DB corruption - see issue 2537
                Log.w(K9.LOG_TAG, "Unable to open DB " + databaseFile + " - removing file and retrying", e);
                databaseFile.delete();
-                mDb = SQLiteDatabase.openOrCreateDatabase(databaseFile, null);
+                mDb = application.openOrCreateDatabase(databaseFile.getPath(), Context.MODE_PRIVATE, null);
            }
            if (mDb.getVersion() != mSchemaDefinition.getVersion()) {
                mSchemaDefinition.doDbUpgrade(mDb);
--- a/src/com/fsck/k9/view/MessageWebView.java
+++ b/src/com/fsck/k9/view/MessageWebView.java
@ -98,7 +98,13 @@ public class MessageWebView extends WebView {
            webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
        }

-        if (Integer.parseInt(Build.VERSION.SDK) >= 9 ) {
+        /*
+         * Build.VERSION.SDK is deprecated cause it just returns the
+         * "its raw String representation"
+         *  http://developer.android.com/reference/android/os/Build.VERSION_CODES.html#GINGERBREAD
+         *  http://developer.android.com/reference/android/os/Build.VERSION.html#SDK
+         */
+        if (Build.VERSION.SDK_INT >= 9) {
            setOverScrollMode(OVER_SCROLL_NEVER);
        }

--- a/tests/project.properties
+++ b/tests/project.properties
@ -8,4 +8,4 @@
 # project structure.

 # Project target.
-target=android-10
+target=android-15
--- a/tests/src/com/fsck/k9/helper/HtmlConverterTest.java
+++ b/tests/src/com/fsck/k9/helper/HtmlConverterTest.java
@ -0,0 +1,86 @@
+package com.fsck.k9.helper;
+
+import junit.framework.TestCase;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+
+public class HtmlConverterTest extends TestCase {
+    // Useful if you want to write stuff to a file for debugging in a browser.
+    private static final boolean WRITE_TO_FILE = Boolean.parseBoolean(System.getProperty("k9.htmlConverterTest.writeToFile", "false"));
+    private static final String OUTPUT_FILE = "C:/temp/parse.html";
+
+    public void testTextQuoteToHtmlBlockquote() {
+        String message = "Panama!\n" +
+            "\n" +
+            "Bob Barker <bob@aol.com> wrote:\n" +
+            "> a canal\n" +
+            ">\n" +
+            "> Dorothy Jo Gideon <dorothy@aol.com> espoused:\n" +
+            "> >A man, a plan...\n" +
+            "> Too easy!\n" +
+            "\n" +
+            "Nice job :)\n" +
+            ">> Guess!";
+        String result = HtmlConverter.textToHtml(message, false);
+        writeToFile(result);
+        assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">Panama!<br /><br />Bob Barker &lt;bob@aol.com&gt; wrote:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">a canal<br /><br />Dorothy Jo Gideon &lt;dorothy@aol.com&gt; espoused:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">A man, a plan...<br /></blockquote>Too easy!</blockquote><br />Nice job :)<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\"><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">Guess!</blockquote></blockquote></pre>", result);
+    }
+
+    public void testTextQuoteToHtmlBlockquoteIndented() {
+        String message = "*facepalm*\n" +
+            "\n" +
+            "Bob Barker <bob@aol.com> wrote:\n" +
+            "> A wise man once said...\n" +
+            ">\n" +
+            ">     LOL F1RST!!!!!\n" +
+            ">\n" +
+            "> :)";
+        String result = HtmlConverter.textToHtml(message, false);
+        writeToFile(result);
+        assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">*facepalm*<br /><br />Bob Barker &lt;bob@aol.com&gt; wrote:<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">A wise man once said...<br /><br />LOL F1RST!!!!!<br /><br />:)</blockquote></pre>", result);
+    }
+
+    public void testQuoteDepthColor() {
+        assertEquals(HtmlConverter.getQuoteColor(1), HtmlConverter.QUOTE_COLOR_LEVEL_1);
+        assertEquals(HtmlConverter.getQuoteColor(2), HtmlConverter.QUOTE_COLOR_LEVEL_2);
+        assertEquals(HtmlConverter.getQuoteColor(3), HtmlConverter.QUOTE_COLOR_LEVEL_3);
+        assertEquals(HtmlConverter.getQuoteColor(4), HtmlConverter.QUOTE_COLOR_LEVEL_4);
+        assertEquals(HtmlConverter.getQuoteColor(5), HtmlConverter.QUOTE_COLOR_LEVEL_5);
+
+        assertEquals(HtmlConverter.getQuoteColor(-1), HtmlConverter.QUOTE_COLOR_DEFAULT);
+        assertEquals(HtmlConverter.getQuoteColor(0), HtmlConverter.QUOTE_COLOR_DEFAULT);
+        assertEquals(HtmlConverter.getQuoteColor(6), HtmlConverter.QUOTE_COLOR_DEFAULT);
+
+        String message = "zero\n" +
+            "> one\n" +
+            ">> two\n" +
+            ">>> three\n" +
+            ">>>> four\n" +
+            ">>>>> five\n" +
+            ">>>>>> six";
+        String result = HtmlConverter.textToHtml(message, false);
+        writeToFile(result);
+        assertEquals("<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: sans-serif; margin-top: 0px\">zero<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">one<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">two<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #8ae234; padding-left: 1ex;\">three<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #fcaf3e; padding-left: 1ex;\">four<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #e9b96e; padding-left: 1ex;\">five<br /><blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ccc; padding-left: 1ex;\">six</blockquote></blockquote></blockquote></blockquote></blockquote></blockquote></pre>", result);
+    }
+
+    private void writeToFile(final String content) {
+        if (!WRITE_TO_FILE) {
+            return;
+        }
+        try {
+            System.err.println(content);
+
+            File f = new File(OUTPUT_FILE);
+            f.delete();
+
+            FileWriter fstream = new FileWriter(OUTPUT_FILE);
+            BufferedWriter out = new BufferedWriter(fstream);
+            out.write(content);
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}