diff --git a/.classpath b/.classpath
index d47d4cf37..9ba6b8726 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,5 @@
 	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/jzlib-1.0.7.jar"/>
 	<classpathentry kind="lib" path="libs/jutf7-1.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="compile-only-libs/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="compile-only-libs/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..d7c37e410
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+local.properties
+bin
+gen
+.settings
+*~
diff --git a/Android.mk b/Android.mk
index 5fbfacca1..a17c75e68 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,33 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_STATIC_JAVA_LIBRARIES += libcore
+LOCAL_STATIC_JAVA_LIBRARIES += libdom
+LOCAL_STATIC_JAVA_LIBRARIES += libio
+LOCAL_STATIC_JAVA_LIBRARIES += libjutf
+LOCAL_STATIC_JAVA_LIBRARIES += libjzlib
+
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
+LOCAL_SDK_VERSION := current
+
 LOCAL_PACKAGE_NAME := Email
 
 include $(BUILD_PACKAGE)
+##################################################
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libcore:libs/apache-mime4j-core-0.7-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libio:libs/commons-io-2.0.1.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjutf:libs/jutf7-1.0.1-SNAPSHOT.jar
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjzlib:libs/jzlib-1.0.7.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
+
+# Use the folloing include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3fe7c986d..28592e1cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="13007"
-    android:versionName="3.706" package="com.fsck.k9"
+    android:versionCode="14007"
+    android:versionName="3.907" package="com.fsck.k9"
     >
     <uses-sdk
-       android:minSdkVersion="3"
-       android:targetSdkVersion="4"
+       android:minSdkVersion="7"
+       android:targetSdkVersion="7"
        />
     <supports-screens
         android:largeScreens="true"
@@ -18,10 +18,6 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
 
-    <!-- Needed to get the owner name which is used when the first mail account is created -->
-    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-
     <!-- Needed to mark a contact as contacted -->
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
 
@@ -30,6 +26,10 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- In order to properly manage the BACK key, we do some check on the running tasks -->
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
     <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
 
     <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"
@@ -67,7 +67,7 @@
 
         <activity
             android:name="com.fsck.k9.activity.Accounts"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:configChanges="locale"
             android:label="@string/app_name">
             <intent-filter>
@@ -87,6 +87,9 @@
             android:name="com.fsck.k9.activity.setup.Prefs"
             android:label="@string/prefs_title"
             android:configChanges="locale"
+            android:taskAffinity="com.fsck.k9.activity.setup.Prefs"
+            android:launchMode="singleTask"
+            android:excludeFromRecents="true"
             >
         </activity>
         <activity
@@ -142,6 +145,7 @@
             android:theme="@style/Theme.K9Dialog"
             android:label="@string/choose_folder_title"
             android:configChanges="locale"
+            android:noHistory="true"
             >
         </activity>
         <activity
@@ -203,7 +207,7 @@
         </activity>
         <activity
             android:name="com.fsck.k9.activity.MessageList"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:configChanges="locale"
             >
         </activity>
@@ -275,10 +279,6 @@
             android:name="com.fsck.k9.activity.AccessibleEmailContentActivity"
             >
         </activity>
-        <activity
-            android:name="com.fsck.k9.activity.ImportSettingsActivity"
-            >
-        </activity>
 
         <receiver android:name="com.fsck.k9.service.BootReceiver"
               android:enabled="true"
@@ -329,7 +329,7 @@
               android:enabled="true"
               >
             <intent-filter>
-<!-- 
+<!--
 android.intent.action.MEDIA_MOUNTED
 
      * Broadcast Action:  External media is present and mounted at its mount point.
@@ -339,9 +339,9 @@ android.intent.action.MEDIA_MOUNTED
 
  -->
                 <action android:name="android.intent.action.MEDIA_MOUNTED"/>
-<!-- 
+<!--
 
-MEDIA_EJECT and MEDIA_UNMOUNTED are not defined here: they have to be dynamically registered 
+MEDIA_EJECT and MEDIA_UNMOUNTED are not defined here: they have to be dynamically registered
 otherwise it would make K-9 start at the wrong time
 
  -->
diff --git a/assets/downloading.html b/assets/downloading.html
index 403950b57..d77026c14 100644
--- a/assets/downloading.html
+++ b/assets/downloading.html
@@ -2,7 +2,7 @@
 	<body bgcolor="white">
 		<table width="100%" height="100%">
 			<tr>
-				<td align="center" valign="center">
+				<td align="center" valign="middle">
 					<font color="gray">Downloading...</font>
 					<br/>
 					<br/>
diff --git a/assets/emoticons/24hours.gif b/assets/emoticons/24hours.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/airplane.gif b/assets/emoticons/airplane.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/angry.gif b/assets/emoticons/angry.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/annoy.gif b/assets/emoticons/annoy.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/apple.gif b/assets/emoticons/apple.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/appli01.gif b/assets/emoticons/appli01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/appli02.gif b/assets/emoticons/appli02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/aquarius.gif b/assets/emoticons/aquarius.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/aries.gif b/assets/emoticons/aries.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/art.gif b/assets/emoticons/art.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/atm.gif b/assets/emoticons/atm.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bag.gif b/assets/emoticons/bag.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ban.gif b/assets/emoticons/ban.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/banana.gif b/assets/emoticons/banana.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bank.gif b/assets/emoticons/bank.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bar.gif b/assets/emoticons/bar.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/baseball.gif b/assets/emoticons/baseball.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/basketball.gif b/assets/emoticons/basketball.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bearing.gif b/assets/emoticons/bearing.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/beer.gif b/assets/emoticons/beer.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bell.gif b/assets/emoticons/bell.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bicycle.gif b/assets/emoticons/bicycle.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/birthday.gif b/assets/emoticons/birthday.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bleah.gif b/assets/emoticons/bleah.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bomb.gif b/assets/emoticons/bomb.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/book.gif b/assets/emoticons/book.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bottle.gif b/assets/emoticons/bottle.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/boutique.gif b/assets/emoticons/boutique.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bread.gif b/assets/emoticons/bread.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bud.gif b/assets/emoticons/bud.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/building.gif b/assets/emoticons/building.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bullettrain.gif b/assets/emoticons/bullettrain.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/bus.gif b/assets/emoticons/bus.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/by-d.gif b/assets/emoticons/by-d.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cafe.gif b/assets/emoticons/cafe.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cake.gif b/assets/emoticons/cake.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/camera.gif b/assets/emoticons/camera.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cancer.gif b/assets/emoticons/cancer.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/capricornus.gif b/assets/emoticons/capricornus.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/car.gif b/assets/emoticons/car.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/carouselpony.gif b/assets/emoticons/carouselpony.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cat.gif b/assets/emoticons/cat.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/catface.gif b/assets/emoticons/catface.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cd.gif b/assets/emoticons/cd.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/chair.gif b/assets/emoticons/chair.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cherry.gif b/assets/emoticons/cherry.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cherryblossom.gif b/assets/emoticons/cherryblossom.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/chick.gif b/assets/emoticons/chick.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/clear.gif b/assets/emoticons/clear.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/clip.gif b/assets/emoticons/clip.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/clock.gif b/assets/emoticons/clock.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cloud.gif b/assets/emoticons/cloud.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/clover.gif b/assets/emoticons/clover.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/club.gif b/assets/emoticons/club.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/coldsweats01.gif b/assets/emoticons/coldsweats01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/coldsweats02.gif b/assets/emoticons/coldsweats02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/confident.gif b/assets/emoticons/confident.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/copyright.gif b/assets/emoticons/copyright.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/crown.gif b/assets/emoticons/crown.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/crying.gif b/assets/emoticons/crying.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/cute.gif b/assets/emoticons/cute.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/d-point.gif b/assets/emoticons/d-point.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/danger.gif b/assets/emoticons/danger.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/dash.gif b/assets/emoticons/dash.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/delicious.gif b/assets/emoticons/delicious.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/denim.gif b/assets/emoticons/denim.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/despair.gif b/assets/emoticons/despair.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/diamond.gif b/assets/emoticons/diamond.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/dog.gif b/assets/emoticons/dog.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/dollar.gif b/assets/emoticons/dollar.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/door.gif b/assets/emoticons/door.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/down.gif b/assets/emoticons/down.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/downwardleft.gif b/assets/emoticons/downwardleft.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/downwardright.gif b/assets/emoticons/downwardright.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/drama.gif b/assets/emoticons/drama.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ear.gif b/assets/emoticons/ear.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/eight.gif b/assets/emoticons/eight.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/empty.gif b/assets/emoticons/empty.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/end.gif b/assets/emoticons/end.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/enter.gif b/assets/emoticons/enter.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/event.gif b/assets/emoticons/event.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/eye.gif b/assets/emoticons/eye.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/eyeglass.gif b/assets/emoticons/eyeglass.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/fastfood.gif b/assets/emoticons/fastfood.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/faxto.gif b/assets/emoticons/faxto.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/fish.gif b/assets/emoticons/fish.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/five.gif b/assets/emoticons/five.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/flag.gif b/assets/emoticons/flag.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/flair.gif b/assets/emoticons/flair.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/foot.gif b/assets/emoticons/foot.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/four.gif b/assets/emoticons/four.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/free.gif b/assets/emoticons/free.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/freedial.gif b/assets/emoticons/freedial.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/fuji.gif b/assets/emoticons/fuji.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/full.gif b/assets/emoticons/full.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/fullmoon.gif b/assets/emoticons/fullmoon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/game.gif b/assets/emoticons/game.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/gasstation.gif b/assets/emoticons/gasstation.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/gawk.gif b/assets/emoticons/gawk.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/gemini.gif b/assets/emoticons/gemini.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/golf.gif b/assets/emoticons/golf.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/good.gif b/assets/emoticons/good.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/hairsalon.gif b/assets/emoticons/hairsalon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/happy01.gif b/assets/emoticons/happy01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/happy02.gif b/assets/emoticons/happy02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/heart.gif b/assets/emoticons/heart.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/heart01.gif b/assets/emoticons/heart01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/heart02.gif b/assets/emoticons/heart02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/heart03.gif b/assets/emoticons/heart03.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/heart04.gif b/assets/emoticons/heart04.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/horse.gif b/assets/emoticons/horse.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/hospital.gif b/assets/emoticons/hospital.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/hotel.gif b/assets/emoticons/hotel.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/house.gif b/assets/emoticons/house.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/id.gif b/assets/emoticons/id.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/impact.gif b/assets/emoticons/impact.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/info01.gif b/assets/emoticons/info01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/info02.gif b/assets/emoticons/info02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/japanesetea.gif b/assets/emoticons/japanesetea.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/karaoke.gif b/assets/emoticons/karaoke.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/key.gif b/assets/emoticons/key.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/kissmark.gif b/assets/emoticons/kissmark.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/leftright.gif b/assets/emoticons/leftright.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/leo.gif b/assets/emoticons/leo.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/libra.gif b/assets/emoticons/libra.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/loveletter.gif b/assets/emoticons/loveletter.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/lovely.gif b/assets/emoticons/lovely.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/mail.gif b/assets/emoticons/mail.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/mailto.gif b/assets/emoticons/mailto.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/maple.gif b/assets/emoticons/maple.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/memo.gif b/assets/emoticons/memo.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/mist.gif b/assets/emoticons/mist.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/mobaq.gif b/assets/emoticons/mobaq.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/mobilephone.gif b/assets/emoticons/mobilephone.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/moneybag.gif b/assets/emoticons/moneybag.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/moon1.gif b/assets/emoticons/moon1.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/moon2.gif b/assets/emoticons/moon2.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/moon3.gif b/assets/emoticons/moon3.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/motorsports.gif b/assets/emoticons/motorsports.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/movie.gif b/assets/emoticons/movie.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/music.gif b/assets/emoticons/music.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/new.gif b/assets/emoticons/new.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/newmoon.gif b/assets/emoticons/newmoon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ng.gif b/assets/emoticons/ng.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/night.gif b/assets/emoticons/night.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/nine.gif b/assets/emoticons/nine.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/noodle.gif b/assets/emoticons/noodle.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/nosmoking.gif b/assets/emoticons/nosmoking.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/note.gif b/assets/emoticons/note.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/notes.gif b/assets/emoticons/notes.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ok.gif b/assets/emoticons/ok.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/on.gif b/assets/emoticons/on.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/one.gif b/assets/emoticons/one.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/paper.gif b/assets/emoticons/paper.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/parking.gif b/assets/emoticons/parking.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pass.gif b/assets/emoticons/pass.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pc.gif b/assets/emoticons/pc.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pen.gif b/assets/emoticons/pen.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pencil.gif b/assets/emoticons/pencil.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/penguin.gif b/assets/emoticons/penguin.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/phoneto.gif b/assets/emoticons/phoneto.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pig.gif b/assets/emoticons/pig.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pisces.gif b/assets/emoticons/pisces.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pocketbell.gif b/assets/emoticons/pocketbell.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/postoffice.gif b/assets/emoticons/postoffice.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pouch.gif b/assets/emoticons/pouch.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/pout.gif b/assets/emoticons/pout.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/present.gif b/assets/emoticons/present.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/punch.gif b/assets/emoticons/punch.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/r-mark.gif b/assets/emoticons/r-mark.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/rain.gif b/assets/emoticons/rain.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/recycle.gif b/assets/emoticons/recycle.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/restaurant.gif b/assets/emoticons/restaurant.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ribbon.gif b/assets/emoticons/ribbon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/riceball.gif b/assets/emoticons/riceball.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ring.gif b/assets/emoticons/ring.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/rock.gif b/assets/emoticons/rock.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/rouge.gif b/assets/emoticons/rouge.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/run.gif b/assets/emoticons/run.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/rvcar.gif b/assets/emoticons/rvcar.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sad.gif b/assets/emoticons/sad.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sagittarius.gif b/assets/emoticons/sagittarius.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sandclock.gif b/assets/emoticons/sandclock.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/school.gif b/assets/emoticons/school.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/scissors.gif b/assets/emoticons/scissors.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/scorpius.gif b/assets/emoticons/scorpius.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/search.gif b/assets/emoticons/search.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/secret.gif b/assets/emoticons/secret.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/seven.gif b/assets/emoticons/seven.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/shadow.gif b/assets/emoticons/shadow.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sharp.gif b/assets/emoticons/sharp.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/shine.gif b/assets/emoticons/shine.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ship.gif b/assets/emoticons/ship.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/shock.gif b/assets/emoticons/shock.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/shoe.gif b/assets/emoticons/shoe.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sign01.gif b/assets/emoticons/sign01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sign02.gif b/assets/emoticons/sign02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sign03.gif b/assets/emoticons/sign03.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sign04.gif b/assets/emoticons/sign04.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sign05.gif b/assets/emoticons/sign05.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/signaler.gif b/assets/emoticons/signaler.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/six.gif b/assets/emoticons/six.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ski.gif b/assets/emoticons/ski.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/slate.gif b/assets/emoticons/slate.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sleepy.gif b/assets/emoticons/sleepy.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/smile.gif b/assets/emoticons/smile.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/smoking.gif b/assets/emoticons/smoking.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/snail.gif b/assets/emoticons/snail.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/snow.gif b/assets/emoticons/snow.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/snowboard.gif b/assets/emoticons/snowboard.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/soccer.gif b/assets/emoticons/soccer.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/soon.gif b/assets/emoticons/soon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/spa.gif b/assets/emoticons/spa.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/spade.gif b/assets/emoticons/spade.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sports.gif b/assets/emoticons/sports.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sprinkle.gif b/assets/emoticons/sprinkle.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/subway.gif b/assets/emoticons/subway.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sun.gif b/assets/emoticons/sun.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sweat01.gif b/assets/emoticons/sweat01.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/sweat02.gif b/assets/emoticons/sweat02.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/t-shirt.gif b/assets/emoticons/t-shirt.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/taurus.gif b/assets/emoticons/taurus.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/telephone.gif b/assets/emoticons/telephone.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/tennis.gif b/assets/emoticons/tennis.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/think.gif b/assets/emoticons/think.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/three.gif b/assets/emoticons/three.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/thunder.gif b/assets/emoticons/thunder.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/ticket.gif b/assets/emoticons/ticket.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/tm.gif b/assets/emoticons/tm.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/toilet.gif b/assets/emoticons/toilet.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/train.gif b/assets/emoticons/train.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/tulip.gif b/assets/emoticons/tulip.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/tv.gif b/assets/emoticons/tv.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/two.gif b/assets/emoticons/two.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/typhoon.gif b/assets/emoticons/typhoon.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/up.gif b/assets/emoticons/up.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/updown.gif b/assets/emoticons/updown.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/upwardleft.gif b/assets/emoticons/upwardleft.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/upwardright.gif b/assets/emoticons/upwardright.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/virgo.gif b/assets/emoticons/virgo.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/watch.gif b/assets/emoticons/watch.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wave.gif b/assets/emoticons/wave.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/weep.gif b/assets/emoticons/weep.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wheelchair.gif b/assets/emoticons/wheelchair.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wine.gif b/assets/emoticons/wine.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wink.gif b/assets/emoticons/wink.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wobbly.gif b/assets/emoticons/wobbly.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/wrench.gif b/assets/emoticons/wrench.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/xmas.gif b/assets/emoticons/xmas.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/yacht.gif b/assets/emoticons/yacht.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/yen.gif b/assets/emoticons/yen.gif
old mode 100755
new mode 100644
diff --git a/assets/emoticons/zero.gif b/assets/emoticons/zero.gif
old mode 100755
new mode 100644
diff --git a/assets/empty.html b/assets/empty.html
index f2f3af345..ae837b940 100644
--- a/assets/empty.html
+++ b/assets/empty.html
@@ -2,7 +2,7 @@
 	<body bgcolor="white">
 		<table width="100%" height="100%">
 			<tr>
-				<td align="center" valign="center">
+				<td align="center" valign="middle">
 					<font color="gray">No text</font>
 				</td>
 			</tr>
diff --git a/assets/loading.html b/assets/loading.html
index 0cc9cecc3..fc8c14ac8 100644
--- a/assets/loading.html
+++ b/assets/loading.html
@@ -2,7 +2,7 @@
 	<body bgcolor="white">
 		<table width="100%" height="100%">
 			<tr>
-				<td align="center" valign="center">
+				<td align="center" valign="middle">
 					<font color="gray">Loading...</font>
 					<br/>
 					<br/>
diff --git a/build.xml b/build.xml
index 2ebbc8e7b..33344aaf4 100644
--- a/build.xml
+++ b/build.xml
@@ -77,24 +77,22 @@
     </target>
 
     <!-- rules -->
-    <target name="bump-version" depends="set-version,commit-version,git-tag">
+    <target name="bump-version" depends="set-version,commit-version">
         <echo>Bumping K-9 to ${version-name}</echo>
     </target>
 
-    <target name="git-tag">
-    <exec executable="git" failonerror="true">
-        <arg line="tag ${version-name}"/>
-    </exec>
-    </target>
     <target name="commit-version">
     <exec executable="git" failonerror="true">
         <arg line="commit -m'Bumped manifest to ${version-name}' AndroidManifest.xml"/>
     </exec>
+    <exec executable="git" failonerror="true">
+        <arg line="tag ${version-name}"/>
+    </exec>
     <exec executable="git" failonerror="true">
         <arg line="push"/>
     </exec>
     <exec executable="git" failonerror="true">
-        <arg line="push --tags"/>
+        <arg line="push tag ${version-name}"/>
     </exec>
     </target>
 
@@ -104,7 +102,7 @@
         <echo>Creating library ${rclib} for remote control
         applications</echo>
 
-	<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
+    <jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
     </target>
 
     <target name="upload" depends="clean,get-version,release">
@@ -161,6 +159,7 @@
         <echo>   bump-version: ant -Dversion-name=3.123</echo>
         <echo>               Bumps the project version to 3.123,tags and commits it</echo>
         <echo>   astyle:     Make K-9's source look like it's supposed to</echo>
+        <echo>   eclipse:    Apply template Eclipse settings</echo>
     </target>
 
 
@@ -184,4 +183,10 @@
     -->
     <setup />
 
+    <target name="eclipse" description="Apply template Eclipse settings">
+        <copy todir=".settings">
+            <fileset dir="tools/eclipse-settings"/>
+        </copy>
+    </target>
+
 </project>
diff --git a/compile-only-libs/commons-codec-1.3.jar b/compile-only-libs/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752a..000000000
Binary files a/compile-only-libs/commons-codec-1.3.jar and /dev/null differ
diff --git a/compile-only-libs/commons-logging-1.1.1.jar b/compile-only-libs/commons-logging-1.1.1.jar
deleted file mode 100644
index 8758a96b7..000000000
Binary files a/compile-only-libs/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/compile-only-libs/mockito-all-1.8.5.jar b/compile-only-libs/mockito-all-1.8.5.jar
new file mode 100644
index 000000000..4b0395ed8
Binary files /dev/null and b/compile-only-libs/mockito-all-1.8.5.jar differ
diff --git a/default.properties b/default.properties
index 528230532..8fc4bac37 100644
--- a/default.properties
+++ b/default.properties
@@ -10,6 +10,6 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-9
+target=android-10
 extensible.libs.classpath=compile-only-libs
 java.encoding=utf8
diff --git a/k9mail.iml b/k9mail.iml
index b5267d68f..1f9d13dd0 100644
--- a/k9mail.iml
+++ b/k9mail.iml
@@ -3,7 +3,6 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="PLATFORM_NAME" value="Android 2.3.1 Platform" />
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
@@ -17,7 +16,6 @@
         <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
         <option name="CUSTOM_COMPILER_MANIFEST" value="" />
         <option name="APK_PATH" value="" />
-        <option name="ADD_ANDROID_LIBRARY" value="true" />
         <option name="LIBRARY_PROJECT" value="false" />
         <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
         <option name="GENERATE_UNSIGNED_APK" value="false" />
@@ -79,33 +77,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/compile-only-libs/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/compile-only-libs/bcprov-jdk15-143.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/compile-only-libs/commons-codec-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
diff --git a/res/drawable-hdpi/ic_button_contacts.png b/res/drawable-hdpi/ic_button_contacts.png
new file mode 100644
index 000000000..2ad43e870
Binary files /dev/null and b/res/drawable-hdpi/ic_button_contacts.png differ
diff --git a/res/drawable-hdpi/ic_button_mark_read.png b/res/drawable-hdpi/ic_button_mark_read.png
old mode 100755
new mode 100644
diff --git a/res/drawable-hdpi/ic_button_mark_unread.png b/res/drawable-hdpi/ic_button_mark_unread.png
old mode 100755
new mode 100644
diff --git a/res/drawable-hdpi/ic_menu_identity.png b/res/drawable-hdpi/ic_menu_identity.png
old mode 100755
new mode 100644
diff --git a/res/drawable/button_indicator_prev.png b/res/drawable/button_indicator_prev.png
old mode 100755
new mode 100644
diff --git a/res/drawable/colorpicker_menjadi.png b/res/drawable/colorpicker_menjadi.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_button_contacts.png b/res/drawable/ic_button_contacts.png
new file mode 100644
index 000000000..ea67931a9
Binary files /dev/null and b/res/drawable/ic_button_contacts.png differ
diff --git a/res/drawable/ic_button_mark_read.png b/res/drawable/ic_button_mark_read.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_button_mark_unread.png b/res/drawable/ic_button_mark_unread.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_menu_identity.png b/res/drawable/ic_menu_identity.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_menu_navigate.png b/res/drawable/ic_menu_navigate.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_menu_reverse_sort.png b/res/drawable/ic_menu_reverse_sort.png
old mode 100755
new mode 100644
diff --git a/res/drawable/ic_menu_set_sort.png b/res/drawable/ic_menu_set_sort.png
old mode 100755
new mode 100644
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
old mode 100755
new mode 100644
diff --git a/res/layout-land/message_list_item.xml b/res/layout-land/message_list_item.xml
index 4fb86a32c..fd7d98763 100644
--- a/res/layout-land/message_list_item.xml
+++ b/res/layout-land/message_list_item.xml
@@ -64,7 +64,7 @@
         android:layout_toLeftOf="@+id/date" />
     <TextView
         android:id="@+id/subject"
-        android:ellipsize="end"
+        android:ellipsize="marquee"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorPrimary"
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 6139c4809..2cafb2428 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -31,44 +31,93 @@
                     android:layout_marginRight="6dip"
                     android:textColor="@android:color/primary_text_light"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <MultiAutoCompleteTextView
-                    android:id="@+id/to"
-                    android:layout_width="fill_parent"
+                <LinearLayout
+                    android:id="@+id/to_wrapper"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textEmailAddress|textMultiLine"
-                    android:imeOptions="actionNext"
-                    android:hint="@string/message_compose_to_hint"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <MultiAutoCompleteTextView
-                    android:id="@+id/cc"
-                    android:layout_width="fill_parent"
+                    android:baselineAligned="true"
+	                android:layout_marginLeft="6dip"
+	                android:layout_marginRight="6dip"
+                    android:layout_width="fill_parent">
+	                <MultiAutoCompleteTextView
+	                    android:id="@+id/to"
+	                    android:layout_height="wrap_content"
+	                    android:inputType="textEmailAddress|textMultiLine"
+	                    android:imeOptions="actionNext"
+	                    android:hint="@string/message_compose_to_hint"
+	                    android:textColor="@android:color/primary_text_light"
+	                    android:textAppearance="?android:attr/textAppearanceMedium"
+	                    android:layout_width="fill_parent"
+	                    android:layout_marginRight="6dip"
+                        android:layout_weight="5"
+                        />
+	                <ImageButton
+	                    android:id="@+id/add_to"
+                        android:src="@drawable/ic_button_contacts"
+	                    android:layout_weight="1"
+                        android:layout_height="fill_parent"
+	                    android:layout_width="60dip"
+	                    android:layout_marginTop="1dip"
+                        />
+		</LinearLayout>
+                <LinearLayout
+                    android:id="@+id/cc_wrapper"
+                    android:visibility="gone"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textEmailAddress|textMultiLine"
-                    android:imeOptions="actionNext"
-                    android:hint="@string/message_compose_cc_hint"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
-
-                <MultiAutoCompleteTextView
-                    android:id="@+id/bcc"
-                    android:layout_width="fill_parent"
+                    android:baselineAligned="true"
+	                android:layout_marginLeft="6dip"
+	                android:layout_marginRight="6dip"
+                    android:layout_width="fill_parent">
+	                <MultiAutoCompleteTextView
+	                    android:id="@+id/cc"
+	                    android:layout_width="fill_parent"
+	                    android:layout_height="wrap_content"
+                        android:layout_weight="5"
+	                    android:layout_marginRight="6dip"
+	                    android:inputType="textEmailAddress|textMultiLine"
+	                    android:imeOptions="actionNext"
+	                    android:hint="@string/message_compose_cc_hint"
+	                    android:textColor="@android:color/primary_text_light"
+	                    android:textAppearance="?android:attr/textAppearanceMedium"
+	                   />
+	               <ImageButton
+	                   android:id="@+id/add_cc"
+                       android:src="@drawable/ic_button_contacts"
+	                   android:layout_weight="1"
+	                   android:layout_width="60dip"
+                       android:layout_height="fill_parent"
+	                    android:layout_marginTop="1dip"
+                       />
+		</LinearLayout>
+                <LinearLayout
+                    android:id="@+id/bcc_wrapper"
+                    android:visibility="gone"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textEmailAddress|textMultiLine"
-                    android:imeOptions="actionNext"
-                    android:hint="@string/message_compose_bcc_hint"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:visibility="gone" />
+                    android:baselineAligned="true"
+	                android:layout_marginLeft="6dip"
+	                android:layout_marginRight="6dip"
+                    android:layout_width="fill_parent">
+
+	                <MultiAutoCompleteTextView
+	                    android:id="@+id/bcc"
+	                    android:layout_width="fill_parent"
+	                    android:layout_height="wrap_content"
+	                    android:layout_marginRight="6dip"
+                        android:layout_weight="5"
+	                    android:inputType="textEmailAddress|textMultiLine"
+	                    android:imeOptions="actionNext"
+	                    android:hint="@string/message_compose_bcc_hint"
+	                    android:textColor="@android:color/primary_text_light"
+	                    android:textAppearance="?android:attr/textAppearanceMedium"
+	                    />
+	                <ImageButton
+	                    android:layout_marginTop="1dip"
+                        android:layout_height="fill_parent"
+	                    android:id="@+id/add_bcc"
+	                    android:layout_weight="1"
+	                    android:layout_width="60dip"
+                        android:src="@drawable/ic_button_contacts"
+                        />
+		</LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/layout_encrypt"
@@ -103,7 +152,6 @@
 
                             <TextView
                                 android:id="@+id/userId"
-                                android:text=""
                                 android:ellipsize="end"
                                 android:textAppearance="?android:attr/textAppearanceSmall"
                                 android:textColor="@android:color/primary_text_light"
@@ -112,7 +160,6 @@
 
                             <TextView
                                 android:id="@+id/userIdRest"
-                                android:text=""
                                 android:textSize="10sp"
                                 android:ellipsize="end"
                                 android:textColor="@android:color/primary_text_light"
@@ -190,6 +237,17 @@
                 android:textColor="@android:color/primary_text_light"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
+            <Button
+                android:id="@+id/quoted_text_show"
+                android:text="@string/message_compose_show_quoted_text_action"
+                android:textSize="16dip"
+                android:padding="0dip"
+                android:layout_gravity="right"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true" />
+
             <!-- Quoted text bar -->
             <RelativeLayout
                 android:id="@+id/quoted_text_bar"
diff --git a/res/layout/message_list_item_touchable.xml b/res/layout/message_list_item_touchable.xml
index 0cf1ad978..32d27ca07 100644
--- a/res/layout/message_list_item_touchable.xml
+++ b/res/layout/message_list_item_touchable.xml
@@ -83,7 +83,7 @@
         android:layout_marginRight="0dip"
         android:singleLine="false"
         android:bufferType="spannable"
-        android:textColor="?android:attr/textColorTertiary"
+        android:textColor="?android:attr/textColorPrimary"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </RelativeLayout>
diff --git a/res/layout/password_entry_dialog.xml b/res/layout/password_entry_dialog.xml
deleted file mode 100644
index 29bb586a8..000000000
--- a/res/layout/password_entry_dialog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center_horizontal"
-    >
-    <EditText
-                    android:id="@+id/password_text_box"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textPassword"
-                    android:imeOptions="actionNext"
-                    android:singleLine="true"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-  
-</LinearLayout>
diff --git a/res/menu/accounts_context.xml b/res/menu/accounts_context.xml
index e1b486c30..9eb952915 100644
--- a/res/menu/accounts_context.xml
+++ b/res/menu/accounts_context.xml
@@ -7,7 +7,6 @@
     <item android:id="@+id/empty_trash"
         android:title="@string/empty_trash_action" />
     <item android:id="@+id/edit_account"
-        android:icon="@drawable/ic_menu_preferences"
         android:title="@string/account_settings_action" />
     <item android:id="@+id/advanced"
         android:title="@string/advanced">
@@ -24,6 +23,10 @@
         android:title="@string/clear_pending_action" />
     <item android:id="@+id/export"
         android:title="@string/settings_export_account" />
+    <item android:id="@+id/move_up"
+        android:title="@string/manage_accounts_move_up_action" />
+    <item android:id="@+id/move_down"
+        android:title="@string/manage_accounts_move_down_action" />
     </menu>
     </item>
 </menu>
diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 7e782ac19..82ea3303f 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -31,8 +31,10 @@
 		<item android:id="@+id/search"
 		android:title="@string/search_action" />
 	-->
-            <item android:id="@+id/edit_prefs"
-                android:title="@string/global_settings_action"  />
+        <item android:id="@+id/edit_prefs"
+        android:title="@string/preferences_action" 
+        android:icon="@android:drawable/ic_menu_preferences"
+    />
         <item android:id="@+id/import_export"
             android:title="@string/import_export_action">
         <menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index b2c9154d7..b2fb00c15 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -36,6 +36,11 @@
 		android:title="@string/send_as"
 		android:icon="@drawable/ic_menu_identity"
 	/>
+	<item
+		android:id="@+id/read_receipt"
+	android:alphabeticShortcut="r"
+		android:title="@string/read_receipt"
+	/>
 	<item
 		android:id="@+id/add_attachment_image"
 		android:title="@string/add_attachment_action_image"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index afbac3f94..1eecccdeb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -3,14 +3,12 @@
     <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_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcions de Copyright 2006-<xliff:g>%s</xliff:g> Projecte de codi obert d\'Android.</string>
     <string name="app_license">Llicenciat sota Llicència Apache, Versió 2.0.</string>
     <string name="app_authors_fmt">Autors: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Informació de la revisió: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Fem servir les següents biblioteques de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_emoji_icons">Icones Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">Llegeix adjunts del correu</string>
     <string name="read_attachment_desc">Permet a aquesta aplicació que llegeixi els adjunts del correu.</string>
@@ -72,7 +70,7 @@
     <string name="send_messages_action">Envia missatges</string>
     <string name="list_folders_action">Llista de carpetes</string>
     <string name="refresh_folders_action">Refresca carpetes</string>
-    <string name="mark_all_as_read_action">Marca missatges llegits</string>
+    <string name="mark_all_as_read_action">Marca missatges com a llegits</string>
     <string name="add_account_action">Afegeix un compte nou</string>
     <string name="compose_action">Redacta</string>
     <string name="search_action">Cerca</string>
@@ -267,6 +265,7 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha escrit:\n\n</string>
     <string name="message_compose_quoted_text_label">Text citat</string>
     <string name="message_compose_error_no_recipients">Has d’afegir-hi, com a mínim, un destinatari.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Alguns adjunts no s’han carregat. Es carregaran automàticament abans no s’enviï aquest missatge.</string>
     <string name="message_compose_attachments_skipped_toast">Alguns adjunts no es poden reenviar perquè no s’han carregat.</string>
 
@@ -343,6 +342,7 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="global_settings_confirm_action_archive">Arxiva</string>
     <string name="global_settings_confirm_action_delete">Esborra (només la vista del missatge)</string>
     <string name="global_settings_confirm_action_spam">Brossa</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Maca\'ls tots com a llegits</string>
     <string name="global_settings_confirm_action_send">Envia</string>
 
     <string name="global_settings_privacy_mode_title">Bloca notificacions</string>
@@ -872,7 +872,7 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
 
     <string name="batch_ops">Operacions en lot</string>
     <string name="batch_delete_op">Esborra les seleccions</string>
-    <string name="batch_mark_read_op">Marca coma ha llegit les seleccion</string>
+    <string name="batch_mark_read_op">Marca com a ha llegit les seleccion</string>
     <string name="batch_mark_unread_op">Marca com a no llegit les seleccions</string>
     <string name="batch_flag_op">Afegeix un estel a les seleccions</string>
     <string name="batch_unflag_op">Treu l’estel del que s’ha seleccionat</string>
@@ -920,6 +920,9 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="count_search_title">Compta resultats cerca</string>
     <string name="count_search_summary">Apaga-ho perquè es mostri més ràpid</string>
 
+    <string name="hide_special_accounts_title">Amaga comptes especials</string>
+    <string name="hide_special_accounts_summary">Amaga la bústia d\'entrada unificada i tots els missatges dels comptes</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">- Senyalat</string>
     <string name="unread_modifier">- No llegit</string>
@@ -996,7 +999,7 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
 
     <!-- APG related -->
     <string name="error_activity_not_found">No s’ha trobat cap aplicació idònia per a aquesta acció.</string>
-    <string name="error_apg_version_not_supported">Versió APG instal lada no suportada.</string>
+    <string name="error_apg_version_not_supported">Versió APG instal·lada no suportada.</string>
     <string name="btn_crypto_sign">Inicia</string>
     <string name="btn_encrypt">Encripta</string>
     <string name="btn_decrypt">Desencripta</string>
@@ -1020,11 +1023,36 @@ Benvingut a la configuració del K-9.  El K-9 és un client de codi obert per An
     <string name="dialog_confirm_delete_confirm_button">Esborra</string>
     <string name="dialog_confirm_delete_cancel_button">No esborris</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">Confirma moure\'l carpeta brossa</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Realment vols moure aquest missatge a la carpeta brossa?</item>
+        <item quantity="other">Realment vols moure aquest missatge a la carpeta brossa?</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>
+    <string name="dialog_confirm_spam_confirm_button">Sí</string>
+    <string name="dialog_confirm_spam_cancel_button">No</string>
+
+    <string name="dialog_attachment_progress_title">S\'està descarregant adjunt</string>
 
     <string name="debug_logging_enabled">Activada la depuració del registre al sistema de registre d’Android</string>
 
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">No es pot connectar.</string>
+
+    <string name="account_unavailable">Compte \"<xliff:g id="account">%s</xliff:g>\" no és disponible; comprova emmagatzematge</string>
+
+    <string name="settings_attachment_default_path">Desa adjunts a...</string>
+    <string name="attachment_save_title">Desa adjunt</string>
+    <string name="attachment_save_desc">No s\'ha trobat l\'arxiu al navegador. On vols desar l\'adjunt?</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1a64e4bf5..4f517ce88 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -11,9 +11,7 @@
     <!-- 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>-->
     <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autoři: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
     <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
@@ -133,6 +131,7 @@
     <string name="folder_context_menu_title">Možnosti složky</string>
 
     <string name="general_no_subject">(Bez předmětu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
+    <!-- NEW: <string name="general_no_date">No date</string>-->
     <string name="general_no_sender">Bez odesílatele</string>
     <string name="status_loading">Dotazování</string>
     <string name="status_loading_folder">(Dotazování <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -272,6 +271,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> napsal(a):\n\n</string>
     <string name="message_compose_quoted_text_label">Citovaný text</string>
     <string name="message_compose_error_no_recipients">Musíte přidat alespoň jednoho příjemce.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Některé přílohy nebyly staženy. Budou staženy automaticky, než bude tato zpráva odeslána.</string>
     <string name="message_compose_attachments_skipped_toast">Některé přílohy nelze přeposlat, protože ještě nebyly staženy.</string>
 
@@ -348,6 +348,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="global_settings_confirm_action_archive">Archivace</string>
     <string name="global_settings_confirm_action_delete">Mazání (jen v zobrazení zpráv)</string>
     <string name="global_settings_confirm_action_spam">Nevyžádaná</string>
+    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">Odesílání</string>
 
     <string name="global_settings_privacy_mode_title">Oznámení při zamčené obrazovce</string>
@@ -926,6 +927,9 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="count_search_title">Počet výsledků hledání</string>
     <string name="count_search_summary">Vypněte pro rychlejší zobrazování</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - S \u2605</string>
     <string name="unread_modifier"> - Nepřečtené</string>
@@ -1026,6 +1030,24 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="dialog_confirm_delete_confirm_button">Smazat</string>
     <string name="dialog_confirm_delete_cancel_button">Nemazat</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">Ladící záznam do záznamového systému Androidu je povolen</string>
@@ -1033,4 +1055,10 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Nelze se připojit.</string>
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3c94180db..b5d51b605 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -6,14 +6,12 @@
     <!-- 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">Lizensiert unter der Apache License, Version 2.0.</string>
     <string name="app_authors_fmt">Autoren: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Versionsinformationen: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_libraries">Wir benutzen die folgenden externen Bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_emoji_icons">Emoji Bilder: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
-    <string name="read_attachment_label">Anlagen der Nachricht lesen</string>
-    <string name="read_attachment_desc">Dieser Anwendung erlauben die Anlagen Ihrer Nachrichten zu lesen.</string>
+    <string name="read_attachment_label">Anhänge der Nachricht lesen</string>
+    <string name="read_attachment_desc">Dieser Anwendung erlauben die Anhänge Ihrer Nachrichten zu lesen.</string>
     <string name="read_messages_label">Nachrichten lesen</string>
     <string name="read_messages_desc">Der Anwendung erlauben Ihre Nachrichten zu lesen.</string>
     <string name="delete_messages_label">Nachrichten löschen</string>
@@ -56,7 +54,7 @@
     <string name="reply_action">Antworten</string>
     <string name="reply_all_action">Allen antworten</string>
     <string name="delete_action">Löschen</string>
-    <string name="archive_action">Sichern</string>
+    <string name="archive_action">Archivieren</string>
     <string name="spam_action">Spam</string>
     <string name="delete_all_action">Ordner leeren</string>
     <string name="forward_action">Weiterleiten</string>
@@ -111,9 +109,9 @@
     <string name="view_hide_details_action">Details anzeigen/verbergen</string>
     <string name="add_cc_bcc_action">CC/BCC hinzufügen</string>
     <string name="edit_subject_action">Betreff bearbeiten</string>
-    <string name="add_attachment_action">Anlage hinzufügen</string>
-    <string name="add_attachment_action_image">Anlage hinzufügen (Bild)</string>
-    <string name="add_attachment_action_video">Anlage hinzufügen (Video)</string>
+    <string name="add_attachment_action">Anhang hinzufügen</string>
+    <string name="add_attachment_action_image">Anhang hinzufügen (Bild)</string>
+    <string name="add_attachment_action_video">Anhang hinzufügen (Video)</string>
     <string name="dump_settings_action">Einstellungen ausgeben (Dump)</string>
     <string name="empty_trash_action">Papierkorb leeren</string>
     <string name="expunge_action">Bereinigen (Expunge)</string>
@@ -205,7 +203,7 @@
 Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung für Android und basiert auf Androids Standard-E-Mail-Programm.
 \n
 \n\nVerbesserte Funktionen in K-9:
-\n * Laden von Nachrichten durch IMAP IDLE
+\n * Benachrichtigung über neue Nachrichten per IMAP IDLE
 \n * Höhere Performance
 \n * E-Mail-Signaturen
 \n * Automatische Blindkopie an sich selbst
@@ -214,7 +212,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 \n * Konfiguration einer Antwort-Adresse
 \n * Tastatur-Shortcuts
 \n * Verbesserte IMAP-Unterstützung
-\n * Speichern von Anlagen auf SD-Karte
+\n * Speichern von Anhängen auf SD-Karte
 \n * Papierkorb leeren
 \n * Sortieren der Nachrichten
 \n * ...und viele mehr
@@ -257,15 +255,16 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="message_compose_content_hint">Nachrichtentext</string>
     <string name="message_compose_quote_header_separator">-------- Original-Nachricht --------</string>
     <string name="message_compose_quote_header_subject">Betreff:</string>
-    <string name="message_compose_quote_header_send_date">Versendet am:</string>
+    <string name="message_compose_quote_header_send_date">Gesendet:</string>
     <string name="message_compose_quote_header_from">Von:</string>
     <string name="message_compose_quote_header_to">An:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
     <string name="message_compose_reply_header_fmt">\n\n<xliff:g id="sender">%s</xliff:g> schrieb:\n\n</string>
     <string name="message_compose_quoted_text_label">Zitierter Text</string>
     <string name="message_compose_error_no_recipients">Sie müssen mindestens einen Empfänger wählen.</string>
-    <string name="message_compose_downloading_attachments_toast">Einige Anlagen wurden nicht heruntergeladen. Sie werden automatisch heruntergeladen, bevor diese Nachricht gesendet wird.</string>
-    <string name="message_compose_attachments_skipped_toast">Einige Anlagen können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>
+    <string name="error_contact_address_not_found">Es wurde keine E-Mail-Adresse für diesen Kontakt gefunden.</string>
+    <string name="message_compose_downloading_attachments_toast">Einige Anhänge wurden nicht heruntergeladen. Sie werden automatisch heruntergeladen, bevor diese Nachricht gesendet wird.</string>
+    <string name="message_compose_attachments_skipped_toast">Einige Anhänge können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>
 
 
 
@@ -280,11 +279,11 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="message_view_move_action">Verschieben</string>
     <string name="message_view_spam_action">Spam</string>
     <string name="message_view_datetime_fmt">dd. MMM yyyy HH:mm</string>
-    <string name="message_view_status_attachment_saved">Anlage auf SD-Karte gespeichert als <xliff:g id="filename">%s</xliff:g>.</string>
-    <string name="message_view_status_attachment_not_saved">Anlage konnte nicht auf SD-Karte gespeichert werden.</string>
+    <string name="message_view_status_attachment_saved">Anhänge auf SD-Karte gespeichert als <xliff:g id="filename">%s</xliff:g>.</string>
+    <string name="message_view_status_attachment_not_saved">Anhang konnte nicht auf SD-Karte gespeichert werden.</string>
     <string name="message_view_show_pictures_instructions">Wählen Sie \"Bilder anzeigen\", um eingebettete Bilder abzurufen.</string>
     <string name="message_view_show_pictures_action">Bilder anzeigen</string>
-    <string name="message_view_fetching_attachment_toast">Lade Anlage.</string>
+    <string name="message_view_fetching_attachment_toast">Lade Anhang.</string>
     <string name="message_view_no_viewer">Es wurde kein Anzeigeprogramm für <xliff:g id="mimetype">%s</xliff:g> gefunden.</string>
 
 
@@ -300,7 +299,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="new_mailbox_dlg_title">Neuer Ordnername</string>
 
-    <string name="folder_push_active_symbol">(Laden)</string>
+    <string name="folder_push_active_symbol">(Push)</string>
 
     <string name="from_same_sender">Mehr von diesem Absender</string>
 
@@ -340,6 +339,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="global_settings_confirm_action_archive">Archivieren</string>
     <string name="global_settings_confirm_action_delete">Löschen (nur in Nachrichtenansicht)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Alle als gelesen markieren</string>
     <string name="global_settings_confirm_action_send">Senden</string>
 
     <string name="global_settings_privacy_mode_title">Vertrauliche Benachrichtigung</string>
@@ -572,7 +572,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="account_settings_general_title">Allgemeine Einstellungen</string>
     <string name="account_settings_display_prefs_title">Anzeige</string>
-    <string name="account_settings_sync">Ordner synchronisieren</string>
+    <string name="account_settings_sync">Nachrichten abrufen</string>
     <string name="account_settings_folders">Ordner</string>
     <string name="account_settings_message_lists">Liste der Nachrichten</string>
     <string name="account_settings_message_view">Anzeige der Nachricht</string>
@@ -686,7 +686,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_settings_add_account_label">Eine weiteres Konto hinzufügen</string>
     <string name="account_settings_description_label">Kontoname</string>
     <string name="account_settings_name_label">Ihr Name</string>
-    <string name="notifications_title">Benachrichtigungseinstellungen</string>
+    <string name="notifications_title">Benachrichtigungen</string>
     <string name="account_settings_ring_summary">Klingeln bei neuer Nachricht</string>
     <string name="account_settings_vibrate_enable">Vibration</string>
     <string name="account_settings_vibrate_summary">Vibration bei neuer Nachricht</string>
@@ -766,8 +766,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="sort_flagged_last">Nicht markierte Nachrichten zuerst</string>
     <string name="sort_unread_first">Ungelesene Nachrichten zuerst</string>
     <string name="sort_unread_last">Gelesene Nachrichten zuerst</string>
-    <string name="sort_attach_first">Nachrichten mit Anlagen zuerst</string>
-    <string name="sort_unattached_first">Nachrichten ohne Anlagen zuerst</string>
+    <string name="sort_attach_first">Nachrichten mit Anhängen zuerst</string>
+    <string name="sort_unattached_first">Nachrichten ohne Anhänge zuerst</string>
 
     <string name="sort_by">Sortieren nach...</string>
     <string name="sort_by_date">Datum</string>
@@ -775,7 +775,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="sort_by_subject">Betreff</string>
     <string name="sort_by_flag">Wichtigkeit</string>
     <string name="sort_by_unread">Gelesen/Ungelesen</string>
-    <string name="sort_by_attach">Anlage</string>
+    <string name="sort_by_attach">Anhang</string>
     <string name="message_web_view_error">%s</string>
 
     <string name="account_delete_dlg_title">Entfernen</string>
@@ -867,16 +867,16 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="date_format_common">dd.MMM yyyy</string>
     <string name="date_format_iso8601">yyyy-MM-dd</string>
 
-    <string name="batch_ops">Mehrfachauswahl</string>
-    <string name="batch_delete_op">Ausgewählte löschen</string>
-    <string name="batch_mark_read_op">Ausgewählte als gelesen markieren</string>
-    <string name="batch_mark_unread_op">Ausgewählte als ungelesen markieren</string>
-    <string name="batch_flag_op">Ausgewählte als wichtig markieren</string>
-    <string name="batch_unflag_op">Markierung bei Ausgewählten entfernen</string>
-    <string name="batch_archive_op">Ausgewählte sichern</string>
-    <string name="batch_spam_op">Ausgewählte als Spam markieren</string>
-    <string name="batch_move_op">Ausgewählte verschieben</string>
-    <string name="batch_copy_op">Ausgewählte kopieren</string>
+    <string name="batch_ops">Gruppenoperationen</string>
+    <string name="batch_delete_op">Gewählte löschen</string>
+    <string name="batch_mark_read_op">Gewählte als gelesen markieren</string>
+    <string name="batch_mark_unread_op">Gewählte als ungelesen markieren</string>
+    <string name="batch_flag_op">Gewählte als wichtig markieren</string>
+    <string name="batch_unflag_op">Markierung bei Gewählten entfernen</string>
+    <string name="batch_archive_op">Gewählte sichern</string>
+    <string name="batch_spam_op">Gewählte als Spam markieren</string>
+    <string name="batch_move_op">Gewählte verschieben</string>
+    <string name="batch_copy_op">Gewählte kopieren</string>
     <string name="batch_flag_mode">Stern-Modus</string>
     <string name="batch_select_mode">Auswahl-Modus</string>
     <string name="batch_plain_mode">Normaler Modus</string>
@@ -917,6 +917,9 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="count_search_title">Suchergebnisse zählen</string>
     <string name="count_search_summary">Deaktivieren für schnellere Anzeige</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - Wichtig</string>
     <string name="unread_modifier"> - Ungelesen</string>
@@ -985,7 +988,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="message_compose_buggy_gallery">Wählen Sie \"Einstellungen\" -&gt; \"Galerie Work-Around aktivieren\" um Bilder oder Videos mithilfe der 3D-Galerie hinzufügen zu können.</string>
 
     <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
-    <string name="message_compose_use_workaround">Verwenden Sie \"Anlage hinzufügen (Bild)\" oder \"Anlage hinzufügen (Video)\" um Bilder oder Videos mit der 3D-Galerie hinzuzufügen.</string>
+    <string name="message_compose_use_workaround">Verwenden Sie \"Anhang hinzufügen (Bild)\" oder \"Anhang hinzufügen (Video)\" um Bilder oder Videos mit der 3D-Galerie hinzuzufügen.</string>
 
     <string name="miscellaneous_preferences">Verschiedenes</string>
     <string name="misc_preferences_attachment_title">Galerie Work-Around</string>
@@ -1002,7 +1005,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="key_id">id: %s</string>
     <string name="insufficient_apg_permissions">K-9 hat keinen Vollzugriff auf APG, bitte dafür K-9 neu installieren.</string>
     <string name="pgp_mime_unsupported">PGP/MIME Nachrichten werden noch nicht unterstützt.</string>
-    <string name="attachment_encryption_unsupported">Achtung: Anlagen werden zur Zeit weder signiert noch verschlüsselt.</string>
+    <string name="attachment_encryption_unsupported">Achtung: Anhänge werden zur Zeit weder signiert noch verschlüsselt.</string>
     <string name="send_aborted">Senden abgebrochen.</string>
 
     <string name="save_or_discard_draft_message_dlg_title">Entwurf speichern?</string>
@@ -1017,11 +1020,25 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="dialog_confirm_delete_confirm_button">Löschen</string>
     <string name="dialog_confirm_delete_cancel_button">Nicht löschen</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">Als Spam markieren</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Wollen Sie diese Nachricht in den Spam-Ordner verschieben?</item>
+        <item quantity="other">Wollen Sie diese Nachrichten in den Spam-Ordner verschieben?</item>
+    </plurals>
+    <string name="dialog_confirm_spam_confirm_button">Ja</string>
+    <string name="dialog_confirm_spam_cancel_button">Nein</string>
+
+    <string name="dialog_attachment_progress_title">Anhang wird heruntergeladen</string>
 
     <string name="debug_logging_enabled">Debug-Meldungen werden mit Hilfe des Android-Logging-Systems aufgezeichnet.</string>
 
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Verbindungsfehler.</string>
+
+    <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" ist nicht verfügbar; Bitte SD-Karte prüfen.</string>
+
+    <string name="settings_attachment_default_path">Anhang speichern unter...</string>
+    <string name="attachment_save_title">Anhang speichern</string>
+    <string name="attachment_save_desc">Es wurde kein Dateimanager gefunden. Wo soll der Anhang abgelegt werden?</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 57c3d1824..f0f47667c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -6,9 +6,7 @@
     <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_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</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_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Estamos usando las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Iconos de Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -265,6 +263,7 @@ 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="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>
 
@@ -341,6 +340,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <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_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_send">Enviados</string>
 
     <string name="global_settings_privacy_mode_title">Bloquear notificaciones</string>
@@ -917,6 +917,9 @@ 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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - Estrellas</string>
     <string name="unread_modifier"> - Sin leer</string>
@@ -1017,6 +1020,24 @@ 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_attachment_progress_title">Descargando adjunto</string>
 
     <string name="debug_logging_enabled">Opción de depuración activa</string>
@@ -1024,4 +1045,10 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Imposible conectar.</string>
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ab8e1d010..3528256d7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -6,9 +6,7 @@
     <string name="app_copyright_fmt">Tekijänoikeudet 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions tekijänoikeudet -<xliff:g>%s</xliff:g> Androidin avoimen lähdekoodin hanke.</string>
     <string name="app_license">Lisensoitu Apache-lisenssillä, versio 2.0.</string>
     <string name="app_authors_fmt">Tekijät: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Versiotiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Me käytämme seuraavia kolmannen osapuolen kirjastoja: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Emoji-kuvakkeet: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -263,6 +261,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> kirjoitti:\n\n</string>
     <string name="message_compose_quoted_text_label">Lainattu teksti</string>
     <string name="message_compose_error_no_recipients">Valitse ainakin yksi vastaanottaja.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Kaikkia liitteitä ei ladattu. Ne ladataan automaattisest ennen tämän viestin lähettämistä.</string>
     <string name="message_compose_attachments_skipped_toast">Joitakin liitteitä ei voida jatkolähettää, koska niitä ei ole ladattu.</string>
 
@@ -339,6 +338,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="global_settings_confirm_action_archive">Arkistoi</string>
     <string name="global_settings_confirm_action_delete">Poista (vain viestilistassa)</string>
     <string name="global_settings_confirm_action_spam">Roskaposti</string>
+    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">Lähetä</string>
 
     <string name="global_settings_privacy_mode_title">Lukitusnäytön ilmoitukset</string>
@@ -914,6 +914,9 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="count_search_title">Laske haun tulokset</string>
     <string name="count_search_summary">Jos pois päältä, näyttö tulee nopeammin</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - Tähdet</string>
     <string name="unread_modifier"> - Lukemattomat</string>
@@ -1014,6 +1017,24 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="dialog_confirm_delete_confirm_button">Poista</string>
     <string name="dialog_confirm_delete_cancel_button">Älä poista</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">Vianselvitys lokikirjoitus Androidin lokiin otettu käyttöön</string>
@@ -1021,4 +1042,10 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Yhteyden muodostus epäonnistui.</string>
-  </resources>
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ce1d95944..16d59b1a2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -41,4 +41,10 @@
     <string name="account_settings_enable_move_buttons_summary">Montrer les boutons Archiver, Déplacer ou Pourriel</string>
     <string name="batch_spam_op">Déplacer vers Pourriels</string>
     <string name="account_setup_push_limit_label">Maximum de dossiers poussés à vérifier</string>
+    <string name="error_contact_address_not_found">Aucune adresse courriel trouvée</string>
+    <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses courriel</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Voulez-vous déplacer ce message vers le dossiers à pourriels\u00A0?</item>
+        <item quantity="other">Voulez-vous déplacer <xliff:g id="message_count">%1$d</xliff:g> messages vers le dossiers à pourriels\u00A0?</item>
+    </plurals>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2cd499836..5c02c872d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,9 +28,10 @@
   <string name="beta_app_name">K-9 Mail BETA</string>
   <string name="app_authors">Google, Les K-9 Dog Walkers.</string>
   <string name="app_authors_fmt">Auteurs\u00A0: <xliff:g id="app_authors">%s</xliff:g></string>
-  <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
+  <!-- can license text be localized? app_copyright_fmt/app_license -->
   <string name="app_revision_fmt">Information de révision\u00A0: %s</string>
-  <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <string name="app_libraries">Tierces librairies utilisées\u00A0: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_emoji_icons">Icônes Emoji\u00A0: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
   <string name="read_attachment_label">lire les pièces jointes</string>
   <string name="read_attachment_desc">Permet à cette application de lire vos pièces jointes.</string>
@@ -56,7 +57,10 @@
   <string name="status_sending_account">\u0020(Envoi <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
   <string name="status_processing_account">\u0020(Prép <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(Prochaine récupération à <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <string name="status_syncing_off">\u0020(synchronisation désactivée)</string>
+
   <string name="next_action">Suivant</string>
   <string name="okay_action">OK</string>
   <string name="cancel_action">Annuler</string>
@@ -130,6 +134,7 @@
   <string name="accounts_context_menu_title">Options du compte</string>
   <string name="folder_context_menu_title">Options du dossier</string>
   <string name="general_no_subject">(Aucun objet)</string>
+    <string name="general_no_date">Pas de date</string>
   <string name="general_no_sender">Aucun expéditeur</string>
   <string name="status_loading">Récupération\u2026</string>
   <string name="status_loading_folder">(Récupération <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -247,9 +252,10 @@
   <string name="message_compose_reply_header_fmt">\n<xliff:g id="sender">%s</xliff:g> a écrit\u00A0:\n\n</string>
   <string name="message_compose_quoted_text_label">Texte cité</string>
   <string name="message_compose_error_no_recipients">Vous devez ajouter au moins un destinataire.</string>
+    <string name="error_contact_address_not_found">Aucune adresse e-mail trouvée</string>
   <string name="message_compose_downloading_attachments_toast">Certaines pièces jointes n\'ont pas été téléchargées. Elles seront téléchargées automatiquement avant l\'envoi de ce message.</string>
   <string name="message_compose_attachments_skipped_toast">Certaines pièces jointes ne peuvent pas être transmises car elles n\'ont pas été téléchargées.</string>
-
+    <string name="message_compose_show_quoted_text_action">Citer le message</string>
 
 
   <string name="message_view_from_format">De\u00A0: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
@@ -295,9 +301,11 @@
   <string name="global_settings_touchable_label">Interface conviviale au toucher</string>
   <string name="global_settings_touchable_summary">Fournit plus d\'espace dans les éléments des listes</string>
     <string name="global_settings_preview_lines_label">Lignes dʼaperçu</string>
+    <string name="global_settings_show_correspondent_names_label">Afficher le nom des correspondants</string>
+    <string name="global_settings_show_correspondent_names_summary">Afficher le nom des correspondants plutôt que leurs adresses e-mail</string>
 
-    <string name="global_settings_show_contact_name_label">Afficher les noms des contacts connus</string>
-    <string name="global_settings_show_contact_name_summary">Utiliser les noms du carnet d\'adresses</string>
+    <string name="global_settings_show_contact_name_label">Utiliser les noms du carnet d\'adresses</string>
+    <string name="global_settings_show_contact_name_summary">Utiliser en priorité les noms du carnet d\'adresses</string>
     <string name="global_settings_registered_name_color_label">Couleur des contacts connus</string>
     <string name="global_settings_registered_name_color_default">Ne pas mettre en évidence les contacts connus</string>
     <string name="global_settings_registered_name_color_changed">Mettre en évidence (couleur) les contacts connus</string>
@@ -305,13 +313,14 @@
   <string name="global_settings_messageview_fixedwidth_label">Polices à taille fixe</string>
   <string name="global_settings_messageview_fixedwidth_summary">Utiliser une police à taille fixe pour les messages en texte brut</string>
   <string name="global_settings_messageview_return_to_list_label">Retour à la liste après suppression</string>
-  <string name="global_settings_messageview_return_to_list_summary">Retourne à la liste de messages après la suppression d\'un message</string>
+  <string name="global_settings_messageview_return_to_list_summary">Retourner à la liste de messages après la suppression d\'un message</string>
 
     <string name="global_settings_confirm_actions_title">Confirmer les actions</string>
     <string name="global_settings_confirm_actions_summary">Demander une confirmation pour chacune des actions sélectionnées</string>
     <string name="global_settings_confirm_action_archive">Archiver</string>
     <string name="global_settings_confirm_action_delete">Supprimer (mode lecture)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Marquer tout comme lu</string>
     <string name="global_settings_confirm_action_send">Envoyer</string>
 
     <string name="global_settings_privacy_mode_title">Notifications confidentielles</string>
@@ -395,11 +404,11 @@
   <string name="spam_folder_label">Nom du dossier des spams</string>
   <string name="account_setup_incoming_subscribed_folders_only_label">Afficher seulement les dossiers auxquels je suis abonné</string>
   <string name="account_setup_auto_expand_folder">Ouvrir automatiquement le dossier</string>
-  <string name="account_setup_incoming_webdav_path_prefix_label">Chemin WebDAV (Exchange)</string>
+  <string name="account_setup_incoming_webdav_path_prefix_label">Chemin OWA</string>
   <string name="account_setup_incoming_webdav_path_prefix_hint">Optionnel</string>
   <string name="account_setup_incoming_webdav_auth_path_label">Chemin d\'authentification</string>
   <string name="account_setup_incoming_webdav_auth_path_hint">Optionnel</string>
-  <string name="account_setup_incoming_webdav_mailbox_path_label">Chemin de la boîte de réception</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_label">Alias du compte</string>
   <string name="account_setup_incoming_webdav_mailbox_path_hint">Optionnel</string>
   <string name="account_setup_outgoing_title">Paramètres du serveur sortant</string>
   <string name="account_setup_outgoing_smtp_server_label">Serveur SMTP</string>
@@ -486,6 +495,9 @@
   <string name="account_settings_notify_self_summary">Afficher une notification dans la barre d\'état même lors d\'un envoi à partir d\'une identité reliée à un compte</string>
   <string name="account_settings_notification_opens_unread_label">Ouvrir message non lu via notification</string>
   <string name="account_settings_notification_opens_unread_summary">Recherche des messages non lus après un accès à partir des notifications</string>
+    <string name="account_settings_notification_unread_count_label">Afficher le nombre de messages non lus</string>
+    <string name="account_settings_notification_unread_count_summary">Afficher le nombre de messages non lus dans la barre de notification</string>
+
   <string name="account_settings_hide_buttons_label">Défiler les boutons de navigation</string>
   <string name="account_settings_hide_buttons_never">Jamais</string>
   <string name="account_settings_hide_buttons_keyboard_avail">Lorsque le clavier est disponible</string>
@@ -502,8 +514,19 @@
 
   <string name="account_settings_composition">Composition de messages</string>
 
+    <string name="account_settings_default_quoted_text_shown_label">Citer le message original</string>
+    <string name="account_settings_default_quoted_text_shown_summary">Inclure le message d\'origine dans la réponse</string>
+
     <string name="account_settings_reply_after_quote_label">Réponse après la citation</string>
-    <string name="account_settings_reply_after_quote_summary">Lors d\'une réponse, le texte d\'origine précèdera votre réponse</string>
+    <string name="account_settings_reply_after_quote_summary">Faire précéder la réponse par le texte d\'origine</string>
+
+    <string name="account_settings_message_format_label">Format du message</string>
+    <string name="account_settings_message_format_html">HTML (formattage et images conservés)</string>
+    <string name="account_settings_message_format_text">Text brut (formattage et images omis)</string>
+
+    <string name="account_settings_quote_style_label">Style de citation</string>
+    <string name="account_settings_quote_style_prefix">Préfixe (Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">En-tête (Outlook, Yahoo!, Hotmail)</string>
 
     <string name="account_settings_general_title">Paramètres généraux</string>
     <string name="account_settings_display_prefs_title">Affichage</string>
@@ -688,14 +711,23 @@
   <string name="account_delete_dlg_title">Supprimer</string>
   <string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera supprimé de K-9 Mail.</string>
   <string name="account_recreate_dlg_title">Recréer compte</string>
-  <string name="account_recreate_dlg_instructions_fmt">Toutes les données de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacées de K-9 Mail, mais les paramètres du compte seront sauvegardés.</string>
+  <string name="account_recreate_dlg_instructions_fmt">Toutes les données du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacées de K-9 Mail, mais les paramètres seront conservés.</string>
   <string name="account_clear_dlg_title">Vider le compte</string>
-  <string name="account_clear_dlg_instructions_fmt">Tous les messages de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacés de K-9 Mail, mais les paramàtres du compte seront sauvegardés</string>
+  <string name="account_clear_dlg_instructions_fmt">Tous les messages du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacés de K-9 Mail, mais les paramètres seront conservés.</string>
+
   <string name="provider_note_live">Seuls certains comptes «\u00A0Plus\u00A0» autorisent l\'accès POP
         permettant à ce programme de se connecter. Si vous ne pouvez pas
         vous connecter avec votre adresse électronique et votre mot de passe,
         il est possible que vous n\'ayez pas payé un compte «\u00A0Plus\u00A0». Veuillez
         lancer le navigateur Web pour accéder à ces comptes de messagerie.</string>
+
+    <string name="provider_note_yahoojp">Pour utiliser POP3 avec ce fournisseur, vous devez activer POP3 dans les paramètres Yahoo Mail.</string>
+<!-- not sure it's really useful to translate those provider specific strings for a French speaker... -->
+    <string name="provider_note_naver">Pour utiliser IMAP ou POP3 avec ce fournisseur, veuillez vous assurer que les options IMAP ou POP3 soient activées dans les paramètres de Naver Mail.</string>
+    <string name="provider_note_hanmail">Pour utiliser IMAP ou POP3 avec ce fournisseur, veuillez vous assurer que les options IMAP ou POP3 soient activées dans les paramètres de Hanmail(Daum) mail.</string>
+    <string name="provider_note_paran">Pour utiliser IMAP ou POP3 avec ce fournisseur, veuillez vous assurer que les options IMAP ou POP3 soient activées dans les paramètres de Paran mail.</string>
+    <string name="provider_note_nate">Pour utiliser IMAP ou POP3 avec ce fournisseur, veuillez vous assurer que les options IMAP ou POP3 soient activées dans les paramètres de Nate mail.</string>
+
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificat non reconnu</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepter le certificat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rejetter le certificat</string>
@@ -781,6 +813,9 @@
   <string name="gestures_title">Interface gestuelle</string>
   <string name="gestures_summary">Accepter le contrôle par gestuelle</string>
 
+    <string name="compact_layouts_title">Agencement compact</string>
+    <string name="compact_layouts_summary">Modifier l\'agencement pour afficher plus d\'éléments par page</string>
+
     <string name="volume_navigation_title">Navigation à l\'aide du volume</string>
     <string name="volume_navigation_summary">Passer d\'un élément à l\'autre grâce aux touches de volume</string>
     <string name="volume_navigation_message">Visualisation d\'un message</string>
@@ -794,6 +829,10 @@
   <string name="measure_accounts_summary">Désactiver pour un affichage plus rapide</string>
   <string name="count_search_title">Compter les résultats de recherche</string>
   <string name="count_search_summary">Désactiver pour un affichage plus rapide</string>
+
+    <string name="hide_special_accounts_title">Cacher les comptes spéciaux</string>
+    <string name="hide_special_accounts_summary">Cacher «\u00A0Boîte de messagerie unifiée\u00A0» et «\u00A0Tous les messages\u00A0»</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"> - Avec étoile</string>
   <string name="unread_modifier"> - Non lu</string>
@@ -822,6 +861,8 @@
   <string name="font_size_message_list_subject">Sujet du message</string>
   <string name="font_size_message_list_sender">Expéditeur du message</string>
   <string name="font_size_message_list_date">Date du message</string>
+    <string name="font_size_message_list_preview">Aperçu</string>
+
   <string name="font_size_message_view">Vue du message</string>
   <string name="font_size_message_view_sender">Expéditeur du message</string>
   <string name="font_size_message_view_to">Destinataire du message (Pour)</string>
@@ -858,7 +899,7 @@
   <string name="btn_verify">Vérifier</string>
   <string name="unknown_crypto_signature_user_id">«\u00A0inconnu\u00A0»</string>
   <string name="key_id">id\u00A0: %s</string>
-  <string name="insufficient_apg_permissions">K-9 n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 pour corriger cela.</string>
+  <string name="insufficient_apg_permissions">K-9 Mail n\'a pas la permission d\'accéder à AGP, veuillez réinstaller K-9 Mail pour corriger cela.</string>
   <string name="pgp_mime_unsupported">Les messages PGP/MIME ne sont pas encore supportés</string>
   <string name="attachment_encryption_unsupported">Attention\u00A0: La signature et le chiffrement des pièces jointes ne sont pas encore supportés.</string>
   <string name="send_aborted">Envoi annulé.</string>
@@ -874,6 +915,35 @@
     <string name="dialog_confirm_delete_confirm_button">Supprimer</string>
     <string name="dialog_confirm_delete_cancel_button">Ne pas supprimer</string>
 
+    <string name="dialog_confirm_spam_title">Confirmer le déplacement</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Voulez-vous déplacer ce message vers le dossiers à spams\u00A0?</item>
+        <item quantity="other">Voulez-vous déplacer <xliff:g id="message_count">%1$d</xliff:g> messages vers le dossiers à spams\u00A0?</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>
+    <string name="dialog_confirm_spam_confirm_button">Déplacer</string>
+    <string name="dialog_confirm_spam_cancel_button">Ne pas déplacer</string>
+
+    <string name="dialog_attachment_progress_title">Téléchargement de la pièce jointe</string>
+
     <string name="debug_logging_enabled">Sortie de deboguage «\u00A0logcat\u00A0» activée</string>
 
+    <string name="error_unable_to_connect">Connexion impossible</string>
+
+    <string name="account_unavailable">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» n\'est pas disponible\u00A0; veuillez vérifier le stockage</string>
+
+    <string name="settings_attachment_default_path">Enregistrer les pièces jointes dans…</string>
+    <string name="attachment_save_title">Enregistrer les pièces jointes</string>
+    <string name="attachment_save_desc">Aucun gestionnaire de fichiers trouvé. Où souhaitez-vous enregistrer cette pièce jointe\u00A0?</string>
+
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f0baab411..82da970d7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -6,9 +6,7 @@
     <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcións Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
     <string name="app_license">Licienciado baixo a Licencia Apache, Version 2.0.</string>
     <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Información da revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Usamos as seguintes librerías de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Iconos Emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -127,7 +125,7 @@
     <string name="folder_context_menu_title">Opcións de carpeta</string>
 
     <string name="general_no_subject">(sen Asunto)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Sen data</string>
     <string name="general_no_sender">Sen Remitente</string>
     <string name="status_loading">Conectando</string>
     <string name="status_loading_folder">(Conexión <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -258,13 +256,14 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="message_compose_content_hint">Texto da Mensaxe</string>
     <string name="message_compose_quote_header_separator">-------- Mensaxe Orixianl --------</string>
     <string name="message_compose_quote_header_subject">Asunto:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">Enviado:</string>
     <string name="message_compose_quote_header_from">Dende:</string>
     <string name="message_compose_quote_header_to">Para:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escribiu:\n\n</string>
     <string name="message_compose_quoted_text_label">Citado</string>
     <string name="message_compose_error_no_recipients">Debes engadir un destinatario</string>
+    <string name="error_contact_address_not_found">Non atopo enderezo electrónico.</string>
     <string name="message_compose_downloading_attachments_toast">Algúns adxuntos non se descargaron. Serán descargados automáticamente antes de que mandar a mensaxe</string>
     <string name="message_compose_attachments_skipped_toast">Algúns adxuntos non poden reenviarse porque non foron descargados.</string>
 
@@ -323,8 +322,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="global_settings_touchable_label">Previsualizar mensaxe</string>
     <string name="global_settings_touchable_summary">Listas espaciadas con previsualización de mensaxes</string>
     <string name="global_settings_preview_lines_label">Previsualizar liñas</string>
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
+    <string name="global_settings_show_correspondent_names_label">Amosar os nomes correspondentes</string>
+    <string name="global_settings_show_correspondent_names_summary">Amosar os nomes en lugar dos enderezos</string>
     <string name="global_settings_show_contact_name_label">Ver nome de contactos</string>
     <string name="global_settings_show_contact_name_summary">Usar nome de destinatario dende contactos cando esté dispoñible</string>
     <string name="global_settings_registered_name_color_label">Colorear contactos</string>
@@ -341,6 +340,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="global_settings_confirm_action_archive">Arquivar</string>
     <string name="global_settings_confirm_action_delete">Borrar (Mensaxes na vista)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Marcar todos coma lidos</string>
     <string name="global_settings_confirm_action_send">Enviados</string>
 
     <string name="global_settings_privacy_mode_title">Bloquear notificacións</string>
@@ -541,8 +541,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_settings_notify_self_summary">Amosar notificacións durante o envío de correo</string>
     <string name="account_settings_notification_opens_unread_label">Abrir correo non lido</string>
     <string name="account_settings_notification_opens_unread_summary">Abrir correo non lido dende a notificación</string>
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
+    <string name="account_settings_notification_unread_count_label">Amosar número de mensaxes non lidos</string>
+    <string name="account_settings_notification_unread_count_summary">Amosar número de mensaxen non lidos na barra de notificacións.</string>
 
     <string name="account_settings_hide_buttons_label">Botóns de desprazamento</string>
     <string name="account_settings_hide_buttons_never">Nunca</string>
@@ -563,13 +563,13 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="account_settings_reply_after_quote_label">Resposta tras cita</string>
     <string name="account_settings_reply_after_quote_summary">Cando se responda a un correo, o texto orixinal estará por riba da sua resposta</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+    <string name="account_settings_message_format_label">Formato da mensaxe</string>
+    <string name="account_settings_message_format_text">Texto plano (borraránse imaxes e formato)</string>
+    <string name="account_settings_message_format_html">HTML (mantéñense imaxes e formato)</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_quote_style_label">Responder estilo comentario</string>
+    <string name="account_settings_quote_style_prefix">Prefixo (coma Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Cabeceira (coma Outlook, Yahoo!, Hotmail)</string>
 
     <string name="account_settings_general_title">Configuración Xeral</string>
     <string name="account_settings_display_prefs_title">Visualización</string>
@@ -897,8 +897,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="gestures_title">Xestos</string>
     <string name="gestures_summary">Aceptar controles xestuáis</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_title">Compactar deseños</string>
+    <string name="compact_layouts_summary">Axustar o deseño para amosar máis en cada páxina</string>
 
     <string name="volume_navigation_title">Navegación con teclas de volume</string>
     <string name="volume_navigation_summary">Permite moverse polas opcións usando os botóns de volume</string>
@@ -917,6 +917,9 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="count_search_title">Amosar contador de búsqueda</string>
     <string name="count_search_summary">Desactivar para mellorar rendimento</string>
 
+    <string name="hide_special_accounts_title">Agachar contas especiais</string>
+    <string name="hide_special_accounts_summary">Agacha a bandexa de entrada unificada e todas as contas das mensaxes</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"> - Estrelas</string>
     <string name="unread_modifier"> - Sin ler</string>
@@ -955,7 +958,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="font_size_message_list_subject">Asunto</string>
     <string name="font_size_message_list_sender">Remitente</string>
     <string name="font_size_message_list_date">Data</string>
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+    <string name="font_size_message_list_preview">Vista previa</string>
 
     <string name="font_size_message_view">mensaxes</string>
     <string name="font_size_message_view_sender">Remitente</string>
@@ -1017,11 +1020,36 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
     <string name="dialog_confirm_delete_confirm_button">Borrar</string>
     <string name="dialog_confirm_delete_cancel_button">Non borrar</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">Confirmar antes de mover á carpeta spam</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Queres mover esta mensaxe á carpeta spam?</item>
+        <item quantity="other">Queres mover esta mensaxe á carpeta spam?</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>
+    <string name="dialog_confirm_spam_confirm_button">Si</string>
+    <string name="dialog_confirm_spam_cancel_button">Non</string>
+
+    <string name="dialog_attachment_progress_title">Descargando adxunto</string>
 
     <string name="debug_logging_enabled">Opción de depuración activa</string>
 
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Imposible conectar.</string>
+
+    <string name="account_unavailable">A conta \"<xliff:g id="account">%s</xliff:g>\" non está dispoñible; verifica o almacenamento</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>-->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
new file mode 100644
index 000000000..e64553740
--- /dev/null
+++ b/res/values-hu/strings.xml
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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" formatted="false">Copyright 2008-%s The K-9 Dog Walkers. Portions Copyright 2006-%s the Android Open Source Project.</string>
+    <string name="app_license">Licensed under the Apache License, Version 2.0.</string>
+    <string name="app_authors_fmt">Authors: %s</string>
+    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
+    <string name="app_revision_fmt">Revision Information: %s</string>
+    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
+    <string name="app_libraries">"We're using the following third-party libraries: %s"</string>
+    <string name="app_emoji_icons">Emoji icons: %s</string>
+    <string name="read_attachment_label">Levélmellékletek megnyitása</string>
+    <string name="read_attachment_desc">Az alkalmazás engedélyezi a levélmellékletek megnyitását.</string>
+    <string name="read_messages_label">Levelek olvasása</string>
+    <string name="read_messages_desc">Az alkalmazás engedélyezi az emailek olvasását.</string>
+    <string name="delete_messages_label">Levelek törlése</string>
+    <string name="delete_messages_desc">Az alkalmazás engedélyezi az emailek törlését.</string>
+    <string name="about_title_fmt">About %s</string>
+    <string name="accounts_title">Fióklista</string>
+    <string name="advanced">Haladó beállítások</string>
+    <string name="folder_list_title">%s</string>
+    <string name="shortcuts_title">K-9 fiókok</string>
+    <string name="message_list_title" formatted="false">%s:%s</string>
+    <string name="compose_title">Levélírás</string>
+    <string name="debug_title">Hibakeresés</string>
+    <string name="choose_folder_title">Válasszon mappát</string>
+    <string name="choose_color_title">Válasszon színt</string>
+    <string name="activity_header_format" formatted="false">%s%s%s</string>
+    <string name="activity_unread_count">" [%d]"</string>
+    <string name="status_loading_account_folder" formatted="false">" (%s:%s%s)"</string>
+    <string name="status_loading_account_folder_headers" formatted="false">" (Letöltés %s:%s%s)"</string>
+    <string name="status_sending_account" formatted="false">" (Küldés %s%s)"</string>
+    <string name="status_processing_account" formatted="false">" (Feldolgozás %s:%s%s)"</string>
+    <string name="folder_progress" formatted="false">" %s/%s"</string>
+    <string name="status_next_poll">" (Frissítés @ %s)"</string>
+    <string name="status_polling_off">" (Nincs frissítve)"</string>
+    <string name="next_action">Tovább</string>
+    <string name="previous_action">Vissza</string>
+    <string name="okay_action">OK</string>
+    <string name="cancel_action">Mégse</string>
+    <string name="send_action">Küldés</string>
+    <string name="send_again_action">Újraküldés</string>
+    <string name="select_action">Megjelöl</string>
+    <string name="deselect_action">Nem jelöl</string>
+    <string name="reply_action">Válasz</string>
+    <string name="reply_all_action">Válasz mindenkinek</string>
+    <string name="delete_action">Törlés</string>
+    <string name="archive_action">Archiválás</string>
+    <string name="spam_action">Levélszemét</string>
+    <string name="delete_all_action">Mappa törlése</string>
+    <string name="forward_action">Továbbítás</string>
+    <string name="move_action">Áthelyez</string>
+    <string name="continue_action">Folytatás</string>
+    <string name="done_action">Rendben</string>
+    <string name="remove_action">Töröl</string>
+    <string name="discard_action">Mégsem</string>
+    <string name="save_draft_action">Piszkozat</string>
+    <string name="retry_action">Újból</string>
+    <string name="refresh_action">Frissít</string>
+    <string name="check_mail_action">Levelek frissítése</string>
+    <string name="send_messages_action">Üzenet küldése</string>
+    <string name="list_folders_action">Mappa lista</string>
+    <string name="refresh_folders_action">Mappák frissítése</string>
+    <string name="mark_all_as_read_action">Mindent olvasottnak jelöl</string>
+    <string name="add_account_action">Új fiók</string>
+    <string name="compose_action">Levélírás</string>
+    <string name="search_action">Keresés</string>
+    <string name="search_results">Keresés eredménye</string>
+    <string name="preferences_action">Beállítások</string>
+    <string name="open_action">Megnyit</string>
+    <string name="account_settings_action">Fiók beállításai</string>
+    <string name="folder_settings_action">Mappa beállításai</string>
+    <string name="global_settings_action">Általános beállítások</string>
+    <string name="remove_account_action">Fiók törlése</string>
+    <string name="clear_pending_action">Függőben lévők törlése</string>
+    <string name="accounts_action">Fiókok</string>
+    <string name="back_to_accounts_action">◀</string>
+    <string name="back_to_folder_list_action">◀</string>
+    <string name="read_action">Olvas</string>
+    <string name="mark_as_read_action">Olvasottnak jelöl</string>
+    <string name="send_alternate_action">Megosztás</string>
+    <string name="send_alternate_chooser_title">Küldő választása</string>
+    <string name="mark_all_as_read_dlg_title">Mindent olvasottnak jelöl</string>
+    <string name="mark_all_as_read_dlg_instructions_fmt">"A '%s' fiók minden üzenetét olvasottnak jelöli?"</string>
+    <string name="flag_action">Csillagos</string>
+    <string name="unflag_action">Csillag törlése</string>
+    <string name="copy_action">Másolás</string>
+    <string name="show_full_header_action">Mutassa a teljes fejlécet</string>
+    <string name="hide_full_header_action">Kompakt fejléc mutatása</string>
+    <string name="select_text_action">Szöveg kijelölése</string>
+    <string name="mark_as_unread_action">Olvasatlannak jelöl</string>
+    <string name="move_to_action">Áthelyez a</string>
+    <string name="folders_action">Mappák</string>
+    <string name="view_hide_details_action">Részletek be/ki</string>
+    <string name="add_cc_bcc_action">Másolatot kap</string>
+    <string name="edit_subject_action">Tárgy</string>
+    <string name="add_attachment_action">Melléklet</string>
+    <string name="add_attachment_action_image">Kép-melléklet csatolása</string>
+    <string name="add_attachment_action_video">Videó-melléklet csatolása</string>
+    <string name="dump_settings_action">Ideiglenes beállítások</string>
+    <string name="empty_trash_action">Lomtár ürítése</string>
+    <string name="expunge_action">Biztonságos törlés</string>
+    <string name="clear_local_folder_action">Helyi üzenetek törlése</string>
+    <string name="set_sort_action">Sorbarendezés módja</string>
+    <string name="reverse_sort_action">Fordított sorrendben</string>
+    <string name="about_action">Névjegy</string>
+    <string name="prefs_title">Beállítások</string>
+    <string name="accounts_context_menu_title">Fiók beállításai</string>
+    <string name="folder_context_menu_title">Mappa beállítási</string>
+    <string name="general_no_subject">(nincs tárgy)</string>
+    <string name="general_no_date">Nincs dátum</string>
+    <string name="general_no_sender">Nincs feladó</string>
+    <string name="status_loading">Letöltés</string>
+    <string name="status_loading_folder" formatted="false">(Letöltés %s%s)</string>
+    <string name="status_loading_more">Üzenetek betöltése…</string>
+    <string name="status_network_error">Kapcsolódási hiba</string>
+    <string name="status_invalid_id_error">Nincs ilyen üzenet</string>
+    <string name="status_error">Hiba</string>
+    <string name="status_sending">Küldés</string>
+    <string name="status_loading_more_failed">Hibás letöltések újratöltése</string>
+    <string name="load_more_messages_fmt">Az utolsó %d levél frissítése</string>
+    <string name="abbrev_gigabytes">GB</string>
+    <string name="abbrev_megabytes">MB</string>
+    <string name="abbrev_kilobytes">KB</string>
+    <string name="abbrev_bytes">B</string>
+    <string name="account_size_changed" formatted="false">\"%s\" fiók tömörítése %s helyett %s</string>
+    <string name="compacting_account">Fiók tömörítése \"%s\"</string>
+    <string name="clearing_account">Fiók takarítása \"%s\"</string>
+    <string name="recreating_account">A \"%sújbóli létrehozása</string>
+    <string name="notification_new_title">Új levél</string>
+    <string name="notification_new_scrolling">Új levél %s -tól</string>
+    <string name="notification_new_one_account_fmt" formatted="false">%d Olvasatlan (%s)</string>
+    <string name="notification_new_one_account_unknown_unread_count_fmt" formatted="false">%d Új üzenet (%s)</string>
+    <string name="notification_new_multi_account_fmt">a %d fiókban</string>
+    <string name="notification_unsent_title">Levél nincs elküldve</string>
+    <string name="notification_bg_sync_ticker" formatted="false">Levelek ellenörzése: %s:%s</string>
+    <string name="notification_bg_sync_title">Levelek ellenörzése</string>
+    <string name="notification_bg_send_ticker">Küldés a %s fiókkal</string>
+    <string name="notification_bg_send_title">Levél küldése</string>
+    <string name="notification_bg_title_separator">:</string>
+    <string name="special_mailbox_name_inbox">Érkezett</string>
+    <string name="special_mailbox_name_outbox">Postázatlan</string>
+    <string name="special_mailbox_name_drafts">Piszkozat</string>
+    <string name="special_mailbox_name_trash">Lomtár</string>
+    <string name="special_mailbox_name_sent">Elküldött</string>
+    <string name="special_mailbox_name_archive">Archivált</string>
+    <string name="special_mailbox_name_spam">Levélszemét</string>
+    <string name="special_mailbox_name_drafts_fmt">%s</string>
+    <string name="special_mailbox_name_trash_fmt">%s</string>
+    <string name="special_mailbox_name_sent_fmt">%s</string>
+    <string name="special_mailbox_name_archive_fmt">%s</string>
+    <string name="special_mailbox_name_spam_fmt">%s</string>
+    <string name="send_failure_subject">Néhány üzenetet nem sikerült elküldeni</string>
+    <string name="send_failure_body_abbrev">Nézze meg a %s mappát a részletekért.</string>
+    <string name="send_failure_body_fmt">"A K-9 hibát észlelt üzenetküldés közben. A probléma miatt elképzelhető, hogy a levél nem érkezik meg, de az is lehet hogy igen. 
+
+Az ilyen hibás leveleket csillag jelzi a postázandó mappában. Ha eltávolítja a csillagot a K-9 megpróbálja újból elküldeni a levelet. Hosszan a Postázatlan mappára kattintva válassza az Üzenetek küldését.
+
+ A %s tartalmaz küldéssel kapcsolatos hibákat."</string>
+    <string name="alert_header">K-9 riasztás</string>
+    <string name="no_connection_alert">A szinkronizáció és a levélküldés felfüggesztve, hálozati kapcsolat hiánya miatt.</string>
+    <string name="end_of_folder">Nincs több üzenet</string>
+    <string name="accounts_welcome">"Üdvözöljük a K-9 Mail beállításokban. A K-9 egy nyílt forráskódú levelezőprogram Androidra, a sima mail kliens alapjaira helyezve. 
+ 
+K-9 továbbfejlesztett funkciói: 
+ * Push mail using IMAP IDLE 
+ * Jobb teljesítmény 
+ * Message refiling 
+ * E-mail aláírások 
+ * Titkos másolat 
+ * Mappa-előfizetések 
+ * Minden mappa szinkronizálása 
+ * Válasz cím beállítása 
+ * Gyorsbillentyűk 
+ * Jobb IMAP támogatás 
+ * Mellékletek mentése a memóriakártyára 
+ * Kuka ürítése 
+ * Üzenetek válogatás 
+ * ...és még sok más
+
+Magyarította: Deák Tamás (maya98) és RootRulez  
+ 
+Vegye figyelembe, hogy a K-9 nem támogatja a legtöbb ingyenes hotmail fiókot és még sok más klienst. Történnek furcsaságok, ha Microsoft Exchange-el kommunikál.
+ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérdéseit itt teheti fel http://k9mail.googlecode.com/"</string>
+    <string name="debug_version_fmt">Verzió: %s</string>
+    <string name="debug_enable_debug_logging_title">Hibakeresés</string>
+    <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>
+    <string name="message_list_title_fmt" formatted="false">%s:%s %s %s %s %s</string>
+    <string name="message_list_load_more_messages_action">Többi levél letöltése</string>
+    <string name="message_to_fmt">a:%s</string>
+    <string name="message_list_delete_action">Törlés</string>
+    <string name="message_list_mark_read_action">Olvasottnak jelöl</string>
+    <string name="message_list_mark_unread_action">Olvasattlannak jelöl</string>
+    <string name="message_list_flag_action">Csillagos</string>
+    <string name="message_list_unflag_action">Csillag törlése</string>
+    <string name="message_compose_to_hint">Címzett</string>
+    <string name="message_compose_cc_hint">Másolat</string>
+    <string name="message_compose_bcc_hint">Titkos másolat</string>
+    <string name="message_compose_subject_hint">Tárgy</string>
+    <string name="message_compose_content_hint">Levél szövege</string>
+    <string name="message_compose_quote_header_separator">-------- Eredeti levél --------</string>
+    <string name="message_compose_quote_header_subject">Tárgy:</string>
+    <string name="message_compose_quote_header_send_date">Küldve:</string>
+    <string name="message_compose_quote_header_from">Feladó:</string>
+    <string name="message_compose_quote_header_to">Címzett:</string>
+    <string name="message_compose_quote_header_cc">Másolat:</string>
+    <string name="message_compose_reply_header_fmt">"%s írta:
+
+"</string>
+    <string name="message_compose_quoted_text_label">Idézet</string>
+    <string name="message_compose_error_no_recipients">Legalább egy címzetted adjon meg.</string>
+    <string name="error_contact_address_not_found">E-mail cím nem található.</string>
+	<string name="message_compose_downloading_attachments_toast">Néhány melléklet nem lett letöltve. Levélküldés előtt automatikusan letöltődnek.</string>
+    <string name="message_compose_attachments_skipped_toast">Néhány mellékletet nem lehet továbbítani, mert nem lettek letöltve.</string>
+    <string name="message_view_from_format" formatted="false">Feladó: %s &lt;%s></string>
+    <string name="message_to_label">Címzett:</string>
+    <string name="message_view_cc_label">Másolat:</string>
+    <string name="message_view_attachment_view_action">Megnyit</string>
+    <string name="message_view_attachment_download_action">Mentés</string>
+    <string name="message_view_prev_action">▼</string>
+    <string name="message_view_next_action">▲</string>
+    <string name="message_view_archive_action">Archivál</string>
+    <string name="message_view_move_action">Áthelyez</string>
+    <string name="message_view_spam_action">Levélszemét</string>
+    <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
+    <string name="message_view_status_attachment_saved">%s mellékletei a SD kártyára mentve.</string>
+    <string name="message_view_status_attachment_not_saved">Nem lehet a mellékletet az SD kártyára menteni.</string>
+    <string name="message_view_show_pictures_instructions">Válassza a \"Képek mutatását\" a beágyazott képek megjelenítéséhez.</string>
+    <string name="message_view_show_pictures_action">Képek mutatása</string>
+    <string name="message_view_fetching_attachment_toast">Melléklet letöltése.</string>
+    <string name="message_view_no_viewer">%s nincs társítva semmihez.</string>
+    <string name="message_view_download_remainder">Teljes üzenet letöltése</string>
+    <string name="message_additional_headers_not_downloaded">Nincs minden fejléc letöltve. Válassza a \"Minden levélfejléc letöltése\" opciót a bejövő szerverbeállításoknál.</string>
+    <string name="message_no_additional_headers_available">Minden fejléc letöltve, de nincs mind megjelenítve.</string>
+    <string name="message_additional_headers_retrieval_failed">Nem sikerült betölteni az összes fejlécet adatbázishiba, vagy email szerver hiba miatt.</string>
+    <string name="mailbox_select_dlg_title">Mappák</string>
+    <string name="mailbox_select_dlg_new_mailbox_action">Új mappa</string>
+    <string name="new_mailbox_dlg_title">Új mappa neve</string>
+    <string name="folder_push_active_symbol">(Push)</string>
+    <string name="from_same_sender">Összes ettől a feladótol</string>
+    <string name="message_copied_toast">Levél átmásolva</string>
+    <string name="message_moved_toast">Levél áthelyezve</string>
+    <string name="message_deleted_toast">Levél törölve</string>
+    <string name="message_discarded_toast">Levél eldobva</string>
+    <string name="message_saved_toast">Levél mentve a piszkozatokba</string>
+    <string name="message_delete_failed">Levél törlése nem sikerült</string>
+    <string name="about_header">Névjegy %s</string>
+    <string name="about_version">Verzió: %s</string>
+    <string name="global_settings_flag_label">Csillagok</string>
+    <string name="global_settings_flag_summary">Csillag jelzi a fontos leveleket</string>
+    <string name="global_settings_checkbox_label">Többszörös kijelölés</string>
+    <string name="global_settings_checkbox_summary">Kijelölő négyzetet a levelek mellet</string>
+    <string name="global_settings_touchable_label">Levelek előnézete</string>
+    <string name="global_settings_touchable_summary">Üzenetek bővített előnézete</string>
+    <string name="global_settings_preview_lines_label">Előnézeti sorok száma</string>
+    <string name="global_settings_show_correspondent_names_label">Nevek mutatása</string>
+    <string name="global_settings_show_correspondent_names_summary">Ha a címtárban szerepel az email cím, a hozzá tartozó név megjelenítése</string>
+    <string name="global_settings_show_contact_name_label">Névjegyek mutatása</string>
+    <string name="global_settings_show_contact_name_summary">Használja a címzettek nevét ha címtárban szerepel</string>
+    <string name="global_settings_registered_name_color_label">Névjegyek színe</string>
+    <string name="global_settings_registered_name_color_default">Ne használjon színeket a névjegyzékben</string>
+    <string name="global_settings_registered_name_color_changed">Színek használata a névjegyzékben</string>
+    <string name="global_settings_messageview_fixedwidth_label">Fix szélleségű betűk</string>
+    <string name="global_settings_messageview_fixedwidth_summary">Fix szélességű betűtípus használata a sima szöveges üzeneteknél</string>
+    <string name="global_settings_messageview_return_to_list_label">Visszalépés törlés után</string>
+    <string name="global_settings_messageview_return_to_list_summary">Törlés után visszalép a levelek listájára</string>
+    <string name="global_settings_confirm_actions_title">Parancsok megerősítése</string>
+    <string name="global_settings_confirm_actions_summary">Üzenet megjelenítése a parancs végrehatása előtt</string>
+    <string name="global_settings_confirm_action_archive">Archivál</string>
+    <string name="global_settings_confirm_action_delete">Törlés (csak üzenetek nézet)</string>
+    <string name="global_settings_confirm_action_spam">Levélszemét</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Összes megjelölése olvasottként</string>
+	<string name="global_settings_confirm_action_send">Küldés</string>
+    <string name="global_settings_privacy_mode_title">Képernyőzár értesítések</string>
+    <string name="global_settings_privacy_mode_summary">Lezárt képernyőnél ne mutassa a levelek tárgyát a állapotsoron</string>
+    <string name="quiet_time">Csendes mód</string>
+    <string name="quiet_time_description">Éjszakára kikapcsolja a jelzőhangokat, rezgést, villogást</string>
+    <string name="quiet_time_starts">Csendes mód kezdete</string>
+    <string name="quiet_time_ends">Csendes mód vége</string>
+    <string name="account_setup_basics_title">Új fiók létrehozása</string>
+    <string name="account_setup_basics_instructions">A fiókhoz használt email cím:</string>
+    <string name="account_setup_basics_instructions2_fmt">(Másik %d fiók létrehozása.)</string>
+    <string name="account_setup_basics_email_hint">Email cím</string>
+    <string name="account_setup_basics_email_error_invalid_fmt">%s nem mefelelő formátumú email cím.</string>
+    <string name="account_setup_basics_email_error_duplicate_fmt">%s már egy létezik.</string>
+    <string name="account_setup_basics_password_hint">Jelszó</string>
+    <string name="account_setup_basics_default_label">Ez legyen az alapértelmezett levélküldő</string>
+    <string name="account_setup_basics_manual_setup_action">Kézi beállítás</string>
+    <string name="account_setup_check_settings_title" />
+    <string name="account_setup_check_settings_retr_info_msg">Fiók adatainak ellenörzése…</string>
+    <string name="account_setup_check_settings_check_incoming_msg">Bejövő szerver tesztelése…</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">Kimenő szerver tesztelése…</string>
+    <string name="account_setup_check_settings_authenticate">Hitelesítés…</string>
+    <string name="account_setup_check_settings_fetch">Fiók adatainak letöltése…</string>
+    <string name="account_setup_check_settings_finishing_msg">Befejezés…</string>
+    <string name="account_setup_check_settings_canceling_msg">Megszakítás…</string>
+    <string name="account_setup_names_title">Majdnem kész!</string>
+    <string name="account_setup_names_instructions">Az ön fiókja használatra kész, még pár személyes adat hiányzik!</string>
+    <string name="account_setup_names_account_name_label">Adjon a fióknak nevet (nem kötelező):</string>
+    <string name="account_setup_names_user_name_label">Adja meg a nevét (elküldött leveleknél ez jelenik meg):</string>
+    <string name="account_setup_finished_toast">"A fiókbeállítások sikerültek!
+
+Levelek letöltése…"</string>
+    <string name="account_setup_account_type_title">Fiók típusa</string>
+    <string name="account_setup_account_type_instructions">Kiszolgálótípus</string>
+    <string name="account_setup_account_type_pop_action">POP3</string>
+    <string name="account_setup_account_type_imap_action">IMAP</string>
+    <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+    <string name="account_setup_incoming_title">Bejövő szerver</string>
+    <string name="account_setup_incoming_username_label">Felhasználónév</string>
+    <string name="account_setup_incoming_password_label">Jelszó</string>
+    <string name="account_setup_incoming_pop_server_label">POP3 szerver</string>
+    <string name="account_setup_incoming_imap_server_label">IMAP szerver</string>
+    <string name="account_setup_incoming_webdav_server_label">Exchange szerver</string>
+    <string name="account_setup_incoming_port_label">Port</string>
+    <string name="account_setup_incoming_security_label">Kapcsolat biztonsága</string>
+    <string name="account_setup_incoming_auth_type_label">Hitelesítés típus</string>
+    <string name="account_setup_incoming_security_none_label">Nincs</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL (ha elérhető)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL (mindig)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">TLS (ha elérhető)</string>
+    <string name="account_setup_incoming_security_tls_label">TLS (mindig)</string>
+    <string name="account_setup_incoming_delete_policy_label">Üzenet törlésekor</string>
+    <string name="account_setup_incoming_delete_policy_never_label">Ne törlődjön a szerverről</string>
+    <string name="account_setup_incoming_delete_policy_7days_label">7 nap múlva</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">Törlődjön a szerverről</string>
+    <string name="account_setup_incoming_delete_policy_markread_label">Jelölje olvasottnak</string>
+    <string name="account_setup_incoming_compression_label">Használjon tömörítést a hálózaton:</string>
+    <string name="account_setup_incoming_mobile_label">Mobil</string>
+    <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
+    <string name="account_setup_incoming_other_label">Egyéb</string>
+    <string name="account_setup_incoming_save_all_headers_title">Fejlécek letöltése</string>
+    <string name="account_setup_incoming_save_all_headers_label">Minden levélfejléc letöltése</string>
+    <string name="local_storage_provider_external_label">Külső tárhely (SD kártya)</string>
+    <string name="local_storage_provider_internal_label">Belső memória</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s egyéb belső tároló</string>
+    <string name="local_storage_provider_label">Levelek tárolási helye</string>
+    <string name="account_setup_expunge_policy_label">Biztonságos törlés véglegesítése</string>
+    <string name="account_setup_expunge_policy_immediately">Azonnal</string>
+    <string name="account_setup_expunge_policy_on_poll">Frissítés után</string>
+    <string name="account_setup_expunge_policy_manual">Kézileg</string>
+    <string name="account_setup_incoming_imap_path_prefix_label">IMAP útvonal prefix</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint">(automatikusan használja a NAMESPACE ha lehetséges)</string>
+    <string name="drafts_folder_label">Piszkozatok mappája</string>
+    <string name="sent_folder_label">Elküldöttek mappája</string>
+    <string name="trash_folder_label">Lomtár mappája</string>
+    <string name="archive_folder_label">Archiváltak mappája</string>
+    <string name="spam_folder_label">Levélszemét mappája</string>
+    <string name="account_setup_incoming_subscribed_folders_only_label">Csak a megjelölt mappákat</string>
+    <string name="account_setup_auto_expand_folder">Minden mappa kibontása</string>
+    <string name="account_setup_incoming_webdav_path_prefix_label">OWA útvonal</string>
+    <string name="account_setup_incoming_webdav_path_prefix_hint">Választható</string>
+    <string name="account_setup_incoming_webdav_auth_path_label">Hitelesítési útvonal</string>
+    <string name="account_setup_incoming_webdav_auth_path_hint">Választható</string>
+    <string name="account_setup_incoming_webdav_mailbox_path_label">Mailbox álnév</string>
+    <string name="account_setup_incoming_webdav_mailbox_path_hint">Választható</string>
+    <string name="account_setup_outgoing_title">Kimenő szerver beállításai</string>
+    <string name="account_setup_outgoing_smtp_server_label">SMTP szerver</string>
+    <string name="account_setup_outgoing_port_label">Port</string>
+    <string name="account_setup_outgoing_security_label">Kapcsolat biztonsága</string>
+    <string name="account_setup_outgoing_security_none_label">Nincs</string>
+    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
+    <string name="account_setup_outgoing_security_tls_optional_label">TLS (ha lehetséges)</string>
+    <string name="account_setup_outgoing_security_tls_label">TLS (mindig)</string>
+    <string name="account_setup_outgoing_require_login_label">Bejelentkezés szükséges</string>
+    <string name="account_setup_outgoing_username_label">Felhasználónév</string>
+    <string name="account_setup_outgoing_password_label">Jelszó</string>
+    <string name="account_setup_outgoing_authentication_label">Hitelesítés típusa</string>
+    <string name="account_setup_outgoing_authentication_basic_label">Felhasználónév &amp; jelszó</string>
+    <string name="account_setup_outgoing_authentication_basic_username_label">Felhasználónév</string>
+    <string name="account_setup_outgoing_authentication_basic_password_label">Jelszó</string>
+    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP az SMTP előtt</string>
+    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP az SMTP előtt</string>
+    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) az SMTP előtt</string>
+    <string name="account_setup_bad_uri">Hibás beállítás: %s</string>
+    <string name="account_setup_options_title">Fiók beállításai</string>
+    <string name="compact_action">Tömörítés</string>
+    <string name="clear_action">Üzenetek törlése!</string>
+    <string name="recreate_action">Adatok helyreállítása</string>
+    <string name="account_setup_options_mail_check_frequency_label">Új levelek ellenőrzése</string>
+    <string name="account_setup_options_mail_check_frequency_never">Soha</string>
+    <string name="account_setup_options_mail_check_frequency_1min">1 percenként</string>
+    <string name="account_setup_options_mail_check_frequency_5min">5 percenként</string>
+    <string name="account_setup_options_mail_check_frequency_10min">10 percenként</string>
+    <string name="account_setup_options_mail_check_frequency_15min">15 percenként</string>
+    <string name="account_setup_options_mail_check_frequency_30min">30 percenként</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">Minden órában</string>
+    <string name="account_setup_options_mail_check_frequency_2hour">2 óránként</string>
+    <string name="account_setup_options_mail_check_frequency_3hour">3 óránként</string>
+    <string name="account_setup_options_mail_check_frequency_6hour">6 óránként</string>
+    <string name="account_setup_options_mail_check_frequency_12hour">12 óránként</string>
+    <string name="account_setup_options_mail_check_frequency_24hour">24 óránként</string>
+    <string name="push_poll_on_connect_label">Küldéskor új levelek letöltése</string>
+    <string name="account_setup_options_enable_push_label">Azonnali levélfogadás engedélyezése</string>
+    <string name="account_setup_options_enable_push_summary">Ha a szerver támogatja, azonnal értesítést kapunk az érkező levelekről. Ez az opció csökkenti a telefon teljesítményét.</string>
+    <string name="idle_refresh_period_label">Frissítés tétlen kapcsolatkor</string>
+    <string name="idle_refresh_period_1min">Percenként</string>
+    <string name="idle_refresh_period_2min">2 percenként</string>
+    <string name="idle_refresh_period_3min">3 percenként</string>
+    <string name="idle_refresh_period_6min">6 percenként</string>
+    <string name="idle_refresh_period_12min">12 percenként</string>
+    <string name="idle_refresh_period_24min">24 percenként</string>
+    <string name="idle_refresh_period_36min">36 percenként</string>
+    <string name="idle_refresh_period_48min">48 percenként</string>
+    <string name="idle_refresh_period_60min">60 percenként</string>
+    <string name="account_setup_options_default_label">Ez az alapértelmezett levélküldő fiók</string>
+    <string name="account_setup_options_notify_label">Értesítés email érkezésekor</string>
+    <string name="account_setup_options_notify_sync_label">Értesítés adatszinkronizáláskor</string>
+    <string name="account_setup_options_mail_display_count_label">Látható levelek száma</string>
+    <string name="account_setup_options_mail_display_count_10">10 levél</string>
+    <string name="account_setup_options_mail_display_count_25">25 levél</string>
+    <string name="account_setup_options_mail_display_count_50">50 levél</string>
+    <string name="account_setup_options_mail_display_count_100">100 levél</string>
+    <string name="account_setup_options_mail_display_count_250">250 levél</string>
+    <string name="account_setup_options_mail_display_count_500">500 levél</string>
+    <string name="account_setup_options_mail_display_count_1000">1000 levél</string>
+    <string name="account_setup_options_mail_display_count_all">Minden levél</string>
+    <string name="move_copy_cannot_copy_unsynced_message">Ez a levél nem másolható illetve mozgatható máshova, mert nincs szinkronizálva a szerverrel.</string>
+    <string name="account_setup_failed_dlg_title">A konfigurálás nem sikerült</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">"Felhasználónév vagy a jelszó hibás.
+(%s)"</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt">"Nem lehet biztonságosan kapcsolódni a szerverhez.
+(%s)"</string>
+    <string name="account_setup_failed_dlg_server_message_fmt">"Nem lehet kapcsolódni a szerverhez.
+(%s)"</string>
+    <string name="account_setup_failed_dlg_edit_details_action">Módosítás</string>
+    <string name="account_setup_failed_dlg_continue_action">Tovább</string>
+    <string name="account_settings_push_advanced_title">Haladó</string>
+    <string name="account_settings_title_fmt">Fiók beállításai</string>
+    <string name="account_settings_default">Alapértelmezett fiók</string>
+    <string name="account_settings_default_label">Alapértelmezett fiók</string>
+    <string name="account_settings_default_summary">Levélküldéskor ez a fiók az alapértelmezett</string>
+    <string name="account_settings_notify_label">Értesítés új levélnél</string>
+    <string name="account_settings_notify_sync_label">Értesítés szinkronizálásnál</string>
+    <string name="account_settings_email_label">Az email címe</string>
+    <string name="account_settings_notify_summary">Értesítés az állapotsoron ha új levél érkezett</string>
+    <string name="account_settings_notify_sync_summary">Értesítés az állapotsoron adatszinkronizálásánál</string>
+    <string name="account_settings_show_combined_label">Összevont beérkezett üzenetek</string>
+    <string name="account_settings_notify_self_label">Értesítés küldéskor</string>
+    <string name="account_settings_notify_self_summary">Mutassa az állapotsoron ha a küldés sikeres volt</string>
+    <string name="account_settings_notification_opens_unread_label">Értesítés megnyitása</string>
+    <string name="account_settings_notification_opens_unread_summary">Értesítésre kattintva megnyitja az olvasatlan üzeneteket</string>
+    <string name="account_settings_notification_unread_count_label">Olvasatlanok kijelzése</string>
+    <string name="account_settings_notification_unread_count_summary">Olvasatlan levelek száma az állapotsoron.</string>
+    <string name="account_settings_hide_buttons_label">Görgetés iránygombokkal</string>
+    <string name="account_settings_hide_buttons_never">Soha</string>
+    <string name="account_settings_hide_buttons_keyboard_avail">Ha van billentyűzet</string>
+    <string name="account_settings_hide_buttons_always">Mindig</string>
+    <string name="account_settings_enable_move_buttons_label">Művelet gombok megjelenítése</string>
+    <string name="account_settings_enable_move_buttons_summary">Mutassa a Mozgatás, Archív és Levélszemét gombokat</string>
+    <string name="account_settings_hide_move_buttons_label">Művelet gombok görgetése</string>
+    <string name="account_settings_show_pictures_label">Képek megjelenítése</string>
+    <string name="account_settings_show_pictures_never">Soha</string>
+    <string name="account_settings_show_pictures_only_from_contacts">Csak az ismerősökét</string>
+    <string name="account_settings_show_pictures_always">Mindig</string>
+    <string name="account_settings_composition">Levelek küldése</string>
+    <string name="account_settings_reply_after_quote_label">Válasz az idézet után</string>
+    <string name="account_settings_reply_after_quote_summary">Válaszlevélnél az eredeti üzenet fent jelenik meg</string>
+    <string name="account_settings_message_format_label">Levél formátuma</string>
+    <string name="account_settings_message_format_text">Sima szöveg (képek és formázás nélkül)</string>
+    <string name="account_settings_message_format_html">HTML (képekkel és formázással)</string>
+    <string name="account_settings_quote_style_label">Válaszlevél stílusa</string>
+    <string name="account_settings_quote_style_prefix">Előtag (pl. Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Fejléc (pl. Outlook, Yahoo!, Hotmail)</string>
+    <string name="account_settings_general_title">Általános beállítások</string>
+    <string name="account_settings_display_prefs_title">Fiók testreszabása</string>
+    <string name="account_settings_sync">Levelek letöltése</string>
+    <string name="account_settings_folders">Mappák</string>
+    <string name="account_settings_message_lists">Levelek listázása</string>
+    <string name="account_settings_message_view">Levelek megjelenítése</string>
+    <string name="account_settings_quote_prefix_label">Idézett szöveg előtagja</string>
+    <string name="account_settings_crypto">Titkosítás</string>
+    <string name="account_settings_crypto_app">OpenPGP Provider</string>
+    <string name="account_settings_crypto_app_none">None</string>
+    <string name="account_settings_crypto_app_not_available">nem elérhető</string>
+    <string name="account_settings_crypto_auto_signature">Auto aláírás</string>
+    <string name="account_settings_crypto_auto_signature_summary">Használja az email címet a titkosítási kulcshoz</string>
+    <string name="account_settings_mail_check_frequency_label">Frissítés gyakorisága</string>
+    <string name="account_settings_second_class_check_frequency_label">Másodlagosak frissítési gyakorisága</string>
+    <string name="account_settings_storage_title">Tárolás</string>
+    <string name="account_settings_color_label">Fiók színe</string>
+    <string name="account_settings_color_summary">Válasszon egyéni színt a fiókhoz</string>
+    <string name="account_settings_led_color_label">Figyelmeztető LED színe</string>
+    <string name="account_settings_led_color_summary">Telefon LED színe figyelmeztetéskor</string>
+    <string name="account_settings_mail_display_count_label">Helyi mappa mérete</string>
+    <string name="account_settings_autodownload_message_size_label">Letölthető levélméret</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>
+    <string name="account_settings_autodownload_message_size_8">8Kb</string>
+    <string name="account_settings_autodownload_message_size_16">16Kb</string>
+    <string name="account_settings_autodownload_message_size_32">32Kb</string>
+    <string name="account_settings_autodownload_message_size_64">64Kb</string>
+    <string name="account_settings_autodownload_message_size_128">128Kb</string>
+    <string name="account_settings_autodownload_message_size_256">256Kb</string>
+    <string name="account_settings_autodownload_message_size_512">512Kb</string>
+    <string name="account_settings_autodownload_message_size_1024">1Mb</string>
+    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
+    <string name="account_settings_autodownload_message_size_any">nincs korlátozva</string>
+    <string name="account_settings_message_age_label">Dátum szerint</string>
+    <string name="account_settings_message_age_any">mindent (nincs időkorlát)</string>
+    <string name="account_settings_message_age_0">csak a maiak</string>
+    <string name="account_settings_message_age_1">elmúlt 2 nap</string>
+    <string name="account_settings_message_age_2">elmúlt 3 nap</string>
+    <string name="account_settings_message_age_7">elmúlt hét</string>
+    <string name="account_settings_message_age_14">elmúlt 2 hét</string>
+    <string name="account_settings_message_age_21">elmúlt 3 hét</string>
+    <string name="account_settings_message_age_1_month">elmúlt hónap</string>
+    <string name="account_settings_message_age_2_months">elmúlt 2 hónap</string>
+    <string name="account_settings_message_age_3_months">elmúlt 3 hónap</string>
+    <string name="account_settings_message_age_6_months">elműlt 6 hónap</string>
+    <string name="account_settings_message_age_1_year">az elmúlt év</string>
+    <string name="account_settings_folder_display_mode_label">Megjelenítendő mappák</string>
+    <string name="account_settings_folder_display_mode_all">Összes</string>
+    <string name="account_settings_folder_display_mode_first_class">Csak az elsődleges</string>
+    <string name="account_settings_folder_display_mode_first_and_second_class">Első és Másodlagosak</string>
+    <string name="account_settings_folder_display_mode_not_second_class">Minden, kivéve a Másodlagosak</string>
+    <string name="account_settings_folder_sync_mode_label">Letöltendő mappák</string>
+    <string name="account_settings_folder_sync_mode_all">Összes</string>
+    <string name="account_settings_folder_sync_mode_first_class">Csak az elsődlegesek</string>
+    <string name="account_settings_folder_sync_mode_first_and_second_class">Első és Másodlagosak</string>
+    <string name="account_settings_folder_sync_mode_not_second_class">Minden, kivéve a Másodlagosak</string>
+    <string name="account_settings_folder_sync_mode_none">Nincs</string>
+    <string name="account_settings_folder_push_mode_label">Azonnali levélfogadás</string>
+    <string name="account_settings_folder_push_mode_all">Minden</string>
+    <string name="account_settings_folder_push_mode_first_class">Csak az Elsődleges mappák</string>
+    <string name="account_settings_folder_push_mode_first_and_second_class">Első és Másodlagos mappák</string>
+    <string name="account_settings_folder_push_mode_not_second_class">Minden, kivéve a Másodlagosak</string>
+    <string name="account_settings_folder_push_mode_none">Nincs</string>
+    <string name="account_settings_folder_target_mode_label">Áthelyezés/másolás a célmappába</string>
+    <string name="account_settings_folder_target_mode_all">Minden</string>
+    <string name="account_settings_folder_target_mode_first_class">Csak az elsődlegesek</string>
+    <string name="account_settings_folder_target_mode_first_and_second_class">Első és Másodlagosak</string>
+    <string name="account_settings_folder_target_mode_not_second_class">Minden, kivéve a Másodlagosak</string>
+    <string name="account_settings_sync_remote_deletetions_label">Szerver oldali törlések</string>
+    <string name="account_settings_sync_remote_deletetions_summary">Törölje a helyi üzeneteket ha a szerveren törlődtek</string>
+    <string name="folder_settings_title">Mappa beállításai</string>
+    <string name="folder_settings_in_top_group_label">Megjelenítés a fenti csoportban</string>
+    <string name="folder_settings_in_top_group_summary">Mutassa a mappa lista tetjén</string>
+    <string name="folder_settings_folder_display_mode_label">Osztályozott mappanézet</string>
+    <string name="folder_settings_folder_display_mode_normal">Nincs</string>
+    <string name="folder_settings_folder_display_mode_first_class">Elsődleges</string>
+    <string name="folder_settings_folder_display_mode_second_class">Másodlagos</string>
+    <string name="folder_settings_folder_sync_mode_label">Osztályozott szinkronizálás</string>
+    <string name="folder_settings_folder_sync_mode_normal">Nincs</string>
+    <string name="folder_settings_folder_sync_mode_first_class">Elsődleges</string>
+    <string name="folder_settings_folder_sync_mode_second_class">Másodlagos</string>
+    <string name="folder_settings_folder_sync_mode_inherited">Az aktuális osztály</string>
+    <string name="folder_settings_folder_push_mode_label">Osztályozott küldés</string>
+    <string name="folder_settings_folder_push_mode_normal">Nincs</string>
+    <string name="folder_settings_folder_push_mode_first_class">Elsődleges</string>
+    <string name="folder_settings_folder_push_mode_second_class">Másodlagos</string>
+    <string name="folder_settings_folder_push_mode_inherited">Mint a szinkronizált</string>
+    <string name="account_settings_incoming_label">Bejövő szerver</string>
+    <string name="account_settings_incoming_summary">Beérkező levélszerver konfigurálása</string>
+    <string name="account_settings_outgoing_label">Kimenő szerver</string>
+    <string name="account_settings_outgoing_summary">Levélküldő szerver konfigurálása (SMTP)</string>
+    <string name="account_settings_add_account_label">Másik fiók létrehozása</string>
+    <string name="account_settings_description_label">Fiók neve</string>
+    <string name="account_settings_name_label">Az ön neve</string>
+    <string name="notifications_title">Értesítések</string>
+    <string name="account_settings_ring_summary">Csengetés levél érkezésekor</string>
+    <string name="account_settings_vibrate_enable">Rezgés</string>
+    <string name="account_settings_vibrate_summary">Rezgés levél érkezésekor</string>
+    <string name="account_settings_vibrate_pattern_label">Rezgés típusa</string>
+    <string name="account_settings_vibrate_pattern_default">alapértelmezett</string>
+    <string name="account_settings_vibrate_pattern_1">rezgésminta 1</string>
+    <string name="account_settings_vibrate_pattern_2">rezgésminta 2</string>
+    <string name="account_settings_vibrate_pattern_3">rezgésminta 3</string>
+    <string name="account_settings_vibrate_pattern_4">rezgésminta 4</string>
+    <string name="account_settings_vibrate_pattern_5">rezgésminta 5</string>
+    <string name="account_settings_vibrate_times">Rezgés ismétlése</string>
+    <string name="account_settings_ringtone">Új levél csengőhangja</string>
+    <string name="account_settings_led_label">LED villogása</string>
+    <string name="account_settings_led_summary">Villogtatja a LED-et új levél érkezésekor</string>
+    <string name="account_settings_servers">Szerver beállításai</string>
+    <string name="account_settings_composition_title">Levélírás beállításai</string>
+    <string name="account_settings_composition_label">Szerkesztési alapbeállítások</string>
+    <string name="account_settings_composition_summary">Egyéni aláírás készítése</string>
+    <string name="account_settings_identities_label">Személyes adatok</string>
+    <string name="account_settings_identities_summary">Alternatív cím és aláírás létrehozása</string>
+    <string name="manage_identities_title">Személyazonosság</string>
+    <string name="manage_identities_context_menu_title">Személyazonosság</string>
+    <string name="edit_identity_title">Adataim szerkesztése</string>
+    <string name="new_identity_action">Új személyazonosság</string>
+    <string name="account_settings_always_bcc_label">Titkos másolat készítése</string>
+    <string name="account_settings_always_bcc_summary">Az összes elküldött levelélről titkos másolatot küld</string>
+    <string name="manage_identities_edit_action">Szerkeszt</string>
+    <string name="manage_identities_move_up_action">Fentebb</string>
+    <string name="manage_identities_move_down_action">Lentebb</string>
+    <string name="manage_identities_move_top_action">Legfelülre / alap.</string>
+    <string name="manage_identities_remove_action">Töröl</string>
+    <string name="edit_identity_description_label">Személyazonosság részletei</string>
+    <string name="edit_identity_description_hint">(Opcionális)</string>
+    <string name="edit_identity_name_label">Az ön neve</string>
+    <string name="edit_identity_name_hint">(Opcionális)</string>
+    <string name="edit_identity_email_label">Email cím</string>
+    <string name="edit_identity_email_hint">(Kötelező)</string>
+    <string name="edit_identity_reply_to_label">Válaszcím</string>
+    <string name="edit_identity_reply_to_hint">(Opcionális)</string>
+    <string name="edit_identity_signature_label">Aláírás</string>
+    <string name="edit_identity_signature_hint">(Opcionális)</string>
+    <string name="account_settings_signature_use_label">Aláírás használata</string>
+    <string name="account_settings_signature_label">Aláírás</string>
+    <string name="account_settings_signature_summary">Az aláírás hozzáfűzése minden elküldött levélhez</string>
+    <string name="default_signature">"-- 
+Ezt a levelet mobiltelefonról küldtem, K-9 Mail-el. Elnézést a levél rövidségéért és az esetleges hibákért."</string>
+    <string name="default_identity_description">Elsődleges személyazonosságom</string>
+    <string name="choose_identity">Személyazonosság választása</string>
+    <string name="choose_identity_title">Személyazonosság választása</string>
+    <string name="choose_account_title">Válasszon fiókot/személyazonosságot</string>
+    <string name="send_as">Küldés más néven</string>
+    <string name="no_identities">Menjen a Fiók beállításai -> Személyazonosság kezelése és hozzon létre eggyet.</string>
+    <string name="no_removable_identity">Nem tudja eltávolítani, egy azonosítónak lennie kell</string>
+    <string name="identity_has_no_email">Nem tudja használni az azonosítót email cím nélkül</string>
+    <string name="identity_will_not_be_saved">Az ön aláírása és azonosítója nincs mentve, átkerült a piszkozatokba.</string>
+    <string name="sort_earliest_first">Korábbi leveleket előre</string>
+    <string name="sort_latest_first">Későbbi levelket előre</string>
+    <string name="sort_sender_alpha">Feladó szerint sorban</string>
+    <string name="sort_sender_re_alpha">Feladó szerint fordítva</string>
+    <string name="sort_subject_alpha">Tárgy szerint sorban</string>
+    <string name="sort_subject_re_alpha">Tárgy szerint fordítva</string>
+    <string name="sort_flagged_first">Csillagos levelek előre</string>
+    <string name="sort_flagged_last">Csillag nélküliek előre</string>
+    <string name="sort_unread_first">Olvasatlanok előre</string>
+    <string name="sort_unread_last">Olvasottak előre</string>
+    <string name="sort_attach_first">Mellékletes levelek előre</string>
+    <string name="sort_unattached_first">Melléklet nélküliek előre</string>
+    <string name="sort_by">Rendezés...</string>
+    <string name="sort_by_date">Dátum</string>
+    <string name="sort_by_sender">Feladó</string>
+    <string name="sort_by_subject">Tárgy</string>
+    <string name="sort_by_flag">Csillag</string>
+    <string name="sort_by_unread">Olvasott</string>
+    <string name="sort_by_attach">Melléklet</string>
+    <string name="message_web_view_error">%s</string>
+    <string name="account_delete_dlg_title">Fiók törlése</string>
+    <string name="account_delete_dlg_instructions_fmt">A \"%s\" fiók törölve a K9 Mail-ból.</string>
+    <string name="account_recreate_dlg_title">Fiók újbóli létrehozása</string>
+    <string name="account_recreate_dlg_instructions_fmt">Az összes üzenet, melléklet, mappa és beállításai törlődni fognak a \"%s\" fiókból. A fiók beállításai megmaradnak.</string>
+    <string name="account_clear_dlg_title">Fiók tisztítása</string>
+    <string name="account_clear_dlg_instructions_fmt">Minden levél törlődni fog a \"%s\" fiókból, de a beállítások megmaradnak.</string>
+    <string name="provider_note_live">Csak néhány \"Plusz\" postafiók tartalmaz POP hozzáférést. Ha nem tud bejelentkezni a helyes jelszavával, akkor lehet nem fizett elő a \"Plusz\" postafiókra. Kérem használja a webes felülelet hogy hozzáférjen a fiók leveleihez.</string>
+    <string name="provider_note_yahoojp">Ha POP3-at szeretne használni ehhez a szolgáltatóhoz, akkor engedélyezze a Yahoo mail beállításai oldalon.</string>
+    <string name="provider_note_naver">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a  Naver oldalán.</string>
+    <string name="provider_note_hanmail">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Hanmail(Daum) oldalán.</string>
+    <string name="provider_note_paran">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Paran oldalán.</string>
+    <string name="provider_note_nate">Ha POP3-at vagy IMAP-ot szeretne használni ehhez a szolgáltatóhoz, akkor engedélyeznie kell az IMAP vagy POP3 beállításokat a Nate oldalán.</string>
+	<string name="account_setup_failed_dlg_invalid_certificate_title">Felismerhetetlen tanúsítvány</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_accept">Kulcs elfogadva</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_reject">Kulcs elutasítva</string>
+    <string name="message_help_key">"Del (or D) - Delete
+R - Reply
+A - Reply All
+F - Forward
+J or P - Previous Message
+K, N - Next Message
+M - Move
+Y - Copy
+Z - Zoom Out
+Shift-Z - Zoom In
+G - Star"</string>
+    <string name="message_list_help_key">"Del (or D) - Delete
+R - Reply
+A - Reply All
+C - Compose
+F - Forward
+M - Move
+Y - Copy
+G - Star
+O - Sort type
+I - Sort order
+Q - Return to Folders
+S - Select/deselect"</string>
+    <string name="folder_list_help_key">"1 - Display only 1st Class folders
+ 2 - Display 1st and 2nd Class folders
+ 3 - Display all except 2nd Class folders
+ 4 - Display all folders
+ Q - Return to Accounts
+ S - Edit Account Settings"</string>
+    <string name="folder_list_display_mode_label">Mappák megjelenítése</string>
+    <string name="folder_list_display_mode_all">Minen mappa</string>
+    <string name="folder_list_display_mode_first_class">Csak az Elsődleges</string>
+    <string name="folder_list_display_mode_first_and_second_class">Első és Másodlagos</string>
+    <string name="folder_list_display_mode_not_second_class">Mind, kivéve a Másodlagost</string>
+    <string name="account_settings_signature__location_label">Aláírás helyzete</string>
+    <string name="account_settings_signature__location_before_quoted_text">Idézett szöveg elé</string>
+    <string name="account_settings_signature__location_after_quoted_text">Idézett szöveg után</string>
+    <string name="setting_theme_dark">Sötét</string>
+    <string name="setting_theme_light">Világos</string>
+    <string name="display_preferences">Megjelenés beállításai</string>
+    <string name="global_preferences">Általános beállítások</string>
+    <string name="debug_preferences">Hibakeresés</string>
+    <string name="privacy_preferences">Titoktartás</string>
+    <string name="network_preferences">Adatszinkronizálás</string>
+    <string name="interaction_preferences">Működési beállítások</string>
+    <string name="accountlist_preferences">Fiókok listája</string>
+    <string name="messagelist_preferences">Levelek listája</string>
+    <string name="messageview_preferences">Levélírás</string>
+    <string name="settings_theme_label">Téma</string>
+    <string name="settings_language_label">Nyelv</string>
+    <string name="settings_messageview_mobile_layout_label">Egy oszlopos elrendezés</string>
+    <string name="settings_messageview_mobile_layout_summary">HTML üzenetek újraformázása a kisebb kijelzőkhöz.</string>
+    <string name="settings_messageview_zoom_controls_label">Rendszer nagyító használta</string>
+    <string name="settings_messageview_zoom_controls_summary">Engedélyezi a multi touch nagyítást és a nagyító widgeteket.</string>
+    <string name="setting_language_system">Alapértelmezett</string>
+    <string name="background_ops_label">Háttérszinkronizálás</string>
+    <string name="background_ops_never">Soha</string>
+    <string name="background_ops_always">Mindig</string>
+    <string name="background_ops_enabled">"Ha a 'Háttéradatok' bekapcsolva"</string>
+    <string name="background_ops_auto_sync">"Ha a 'Háttéradatok' és 'Auto-szink' bekapcsolva"</string>
+    <string name="no_message_seletected_toast">Nincs levél kiválasztva</string>
+    <string name="date_format_label">Dátum formátuma</string>
+    <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_iso8601">yyyy-MM-dd</string>
+    <string name="batch_ops">Kötegelt feladatok</string>
+    <string name="batch_delete_op">Kijelöltek törlése</string>
+    <string name="batch_mark_read_op">Kijelöltek olvasottnak jelöl</string>
+    <string name="batch_mark_unread_op">Kijelöltek olvasottlannak jelöl</string>
+    <string name="batch_flag_op">Csillag hozzáadása</string>
+    <string name="batch_unflag_op">Csillag törlése</string>
+    <string name="batch_archive_op">Kijelöltek archiválása</string>
+    <string name="batch_spam_op">Kijelöltek levélszemétnek</string>
+    <string name="batch_move_op">Kijelöltek áthelyezése</string>
+    <string name="batch_copy_op">Kijelöltek másolása</string>
+    <string name="batch_flag_mode">Csillag mód</string>
+    <string name="batch_select_mode">Kijelölés mód</string>
+    <string name="batch_plain_mode">Egyszerű mód</string>
+    <string name="batch_select_all">Mindent kijelöl</string>
+    <string name="batch_deselect_all">Kijelölések megszüntetése</string>
+    <string name="account_setup_push_limit_label">Ellenőrízhető mappák száma</string>
+    <string name="account_setup_push_limit_10">10 mappa</string>
+    <string name="account_setup_push_limit_25">25 mappa</string>
+    <string name="account_setup_push_limit_50">50 mappa</string>
+    <string name="account_setup_push_limit_100">100 mappa</string>
+    <string name="account_setup_push_limit_250">250 mappa</string>
+    <string name="account_setup_push_limit_500">500 mappa</string>
+    <string name="account_setup_push_limit_1000">1000 mappa</string>
+    <string name="animations_title">Animációk</string>
+    <string name="animations_summary">Áttünési effektusok használata.</string>
+    <string name="gestures_title">Kézmozdulatok</string>
+    <string name="gestures_summary">Engedélyezi a kézmozdulakkal való vezérlést.</string>
+    <string name="compact_layouts_title">Kompakt elrendezés</string>
+    <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>
+	<string name="volume_navigation_title">Hangerő gomb vezérlés</string>
+    <string name="volume_navigation_summary">Léptetés az hangerő gombokkal</string>
+    <string name="volume_navigation_message">Leveleknél</string>
+    <string name="volume_navigation_list">Lista nézetek váltása</string>
+    <string name="manage_back_title">A \"Vissza\" gomb működése</string>
+    <string name="manage_back_summary">Használva lépjen vissza egy szintet</string>
+    <string name="start_integrated_inbox_title">Kezdőlap az Összevont mappa</string>
+    <string name="start_integrated_inbox_summary">Összes beérkezett levél mappa jelenjen meg indításkor</string>
+    <string name="measure_accounts_title">Mutassa a fiókok méretét</string>
+    <string name="measure_accounts_summary">Kikapcsolva gyorsabb működés</string>
+    <string name="count_search_title">Számolja a keresés eredményét</string>
+    <string name="count_search_summary">Kikcsapcsolva gyorsabb műkodés</string>
+    <string name="hide_special_accounts_title">Különleges fiókok elrejtése</string>
+    <string name="hide_special_accounts_summary">Egységesen elrejti a fiókok bejövő mappáit</string>
+	<string name="search_title" formatted="false">%s %s</string>
+    <string name="flagged_modifier">- Csillagos</string>
+    <string name="unread_modifier">- Olvasatlan</string>
+    <string name="search_all_messages_title">Minden levél</string>
+    <string name="search_all_messages_detail">Az összes levél egy helyen</string>
+    <string name="integrated_inbox_title">Összes beérkezett levél</string>
+    <string name="integrated_inbox_detail">Minden üzenet egy helyen</string>
+    <string name="tap_hint">Érintse meg a borítékot vagy a csillagot a kijelölésekhez</string>
+    <string name="folder_settings_include_in_integrated_inbox_label">Egyesítés</string>
+    <string name="folder_settings_include_in_integrated_inbox_summary">Minden üzenetet az Összes beérkezett mappába</string>
+    <string name="account_settings_searchable_label">Keresés ezekben mappákban</string>
+    <string name="account_settings_searchable_all">Mind</string>
+    <string name="account_settings_searchable_displayable">Látható</string>
+    <string name="account_settings_searchable_none">Semmi</string>
+    <string name="remote_control_label">K-9 Mail távoli vezérlés</string>
+    <string name="remote_control_desc">Lehetővé teszi, hogy az alkalmazás módosítsa a K9 mail beállításait.</string>
+    <string name="font_size_settings_title">Betűméret</string>
+    <string name="font_size_settings_description">Betűméretek beállításai</string>
+    <string name="font_size_account_list">Fiókok listája</string>
+    <string name="font_size_account_name">Fiók neve</string>
+    <string name="font_size_account_description">Fiók részletei</string>
+    <string name="font_size_folder_list">Mappák listája</string>
+    <string name="font_size_folder_name">Mappa neve</string>
+    <string name="font_size_folder_status">Mappa státuszta</string>
+    <string name="font_size_message_list">Levelek listája</string>
+    <string name="font_size_message_list_subject">Tárgy</string>
+    <string name="font_size_message_list_sender">Feladó</string>
+    <string name="font_size_message_list_date">Dátum</string>
+    <string name="font_size_message_list_preview">Előnézet</string>
+    <string name="font_size_message_view">Levelek megjelenítése</string>
+    <string name="font_size_message_view_sender">Feladó</string>
+    <string name="font_size_message_view_to">Címzett</string>
+    <string name="font_size_message_view_cc">Másolatot kap</string>
+    <string name="font_size_message_view_additional_headers">További fejlécek</string>
+    <string name="font_size_message_view_subject">Tárgy</string>
+    <string name="font_size_message_view_time">Idő</string>
+    <string name="font_size_message_view_date">Dátum</string>
+    <string name="font_size_message_view_content">Üzenet szövege</string>
+    <string name="font_size_tiniest">Mini</string>
+    <string name="font_size_tiny">Pici</string>
+    <string name="font_size_smaller">Kisebb</string>
+    <string name="font_size_small">Kicsi</string>
+    <string name="font_size_medium">Közepes</string>
+    <string name="font_size_large">Nagy</string>
+    <string name="font_size_larger">Nagyobb</string>
+    <string name="font_size_webview_smaller">Kisebb</string>
+    <string name="font_size_webview_small">Kicsi</string>
+    <string name="font_size_webview_normal">Normál</string>
+    <string name="font_size_webview_large">Nagyobb</string>
+    <string name="font_size_webview_larger">Legnagyobb</string>
+    <string name="message_compose_buggy_gallery">Kapcsolja be a \"Beállítások\" -> \"Galéria hiba\" ha 3D galériából akar képet mellékelni.</string>
+    <string name="message_compose_use_workaround">Használja a \"Kép csatolása\" vagy \"Videó csatolása\" opciót ha 3D galériából szeretne választani.</string>
+    <string name="miscellaneous_preferences">Egyéb</string>
+    <string name="misc_preferences_attachment_title">Galéria hiba kikerülése</string>
+    <string name="misc_preferences_attachment_description">Gombok megjelenítése a kép/videó csatoláshoz (a 3D Galéria hiba kikerülése érdekében)</string>
+    <string name="error_activity_not_found">Nincs megfelelő alkalmazás ehhez a művelethez.</string>
+    <string name="error_apg_version_not_supported">A telepített APG verzió nem támogatott.</string>
+    <string name="btn_crypto_sign">Aláírás</string>
+    <string name="btn_encrypt">Titkosítás</string>
+    <string name="btn_decrypt">Dekódolás</string>
+    <string name="btn_verify">Ellenőrzés</string>
+    <string name="unknown_crypto_signature_user_id">&lt;ismeretlen></string>
+    <string name="key_id">azonosító: %s</string>
+    <string name="insufficient_apg_permissions">A K-9-nek nincs hozzáférési joga az APG-hez. Kérem telepítse újra a K-9 Mail.</string>
+    <string name="pgp_mime_unsupported">PGP/MIME üzenetek még nem támogatottak.</string>
+    <string name="attachment_encryption_unsupported">Figyelem: a mellékletek nincsenek aláírva vagy nem titkosítottak.</string>
+    <string name="send_aborted">Küldés megszakítva.</string>
+    <string name="save_or_discard_draft_message_dlg_title">Menti piszkozatként?</string>
+    <string name="save_or_discard_draft_message_instructions_fmt">Menti vagy mégsem az üzenetet?</string>
+    <string name="charset_not_found">Ez az üzenet nem jeleníthető meg, mert a \"%s\" kódlap nem található.</string>
+    <string name="select_text_now">Szöveg kijelölése.</string>
+    <string name="dialog_confirm_delete_title">Törlés megerősítése</string>
+    <string name="dialog_confirm_delete_message">Biztos hogy törli ezt a levelet?</string>
+    <string name="dialog_confirm_delete_confirm_button">Törlés</string>
+    <string name="dialog_confirm_delete_cancel_button">Nem törlöm</string>
+    <string name="dialog_confirm_spam_title">Levélszemét mappa áthelyzésének jóváhagyása</string>
+    <string name="dialog_confirm_spam_message">Valóban át szeretné helyezni?</string>
+    <string name="dialog_confirm_spam_confirm_button">Igen</string>
+    <string name="dialog_confirm_spam_cancel_button">Nem</string>
+    <string name="dialog_attachment_progress_title">Csatolmányok letöltése</string>
+	<string name="debug_logging_enabled">Hibakereső naplózás bekapcsolva</string>
+    <string name="messagelist_sent_to_me_sigil">»</string>
+    <string name="messagelist_sent_cc_me_sigil">›</string>
+    <string name="error_unable_to_connect">Nem lehet kapcsolódni.</string>
+	<string name="account_unavailable"> \"%s\" fiók nem elérhető ellenőríze a tárhelyet</string>
+    <string name="settings_attachment_default_path">Csatolményok mentése ide:</string>
+    <string name="attachment_save_title">Csatolményok mentése</string>
+    <string name="attachment_save_desc">Nincs fájlkezelő. Hova szeretné mentni a csatolmányt?</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8cccd0f1e..b9c5918b0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -6,9 +6,7 @@
     <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">Rilasciato sotto Licenza Apache, Versione 2.0.</string>
     <string name="app_authors_fmt">Autori: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Informazioni: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">Ci avvaliamo delle seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Icone emoji: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -112,6 +110,9 @@
     <string name="view_hide_details_action">Mostra/nascondi dettagli</string>
     <string name="add_cc_bcc_action">Aggiungi Cc/Ccn</string>
     <string name="edit_subject_action">Modifica oggetto</string>
+    <string name="read_receipt">Notifica di lettura</string>
+    <string name="read_receipt_enabled">Notifica di lettura attiva</string>
+    <string name="read_receipt_disabled">Notifica di lettura disattiva</string>
     <string name="add_attachment_action">Aggiungi allegato</string>
     <string name="add_attachment_action_image">Aggiungi allegato (Immagine)</string>
     <string name="add_attachment_action_video">Aggiungi allegato (Video)</string>
@@ -267,6 +268,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha scritto:\n\n</string>
     <string name="message_compose_quoted_text_label">Testo quotato</string>
     <string name="message_compose_error_no_recipients">È necessario specificare almeno un destinatario.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Alcuni allegati non sono stati scaricati. Verranno scaricati automaticamente prima che questo messaggio venga inviato.</string>
     <string name="message_compose_attachments_skipped_toast">Alcuni allegati non possono essere inoltrati in quanto non sono stati scaricati.</string>
 
@@ -343,6 +345,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="global_settings_confirm_action_archive">Archivia</string>
     <string name="global_settings_confirm_action_delete">Elimina (soltanto in visualizzazione messaggi)</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_send">Invia</string>
 
     <string name="global_settings_privacy_mode_title">Notifiche con blocco dello schermo</string>
@@ -569,6 +572,9 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="account_settings_message_format_text">Plain Text (verranno rimosse immagini e formattazione)</string>
     <string name="account_settings_message_format_html">HTML (immagini e formattazione verranno preservate)</string>
 
+    <string name="account_settings_message_read_receipt_label">Notifica di lettura</string>
+    <string name="account_settings_message_read_receipt_summary">Richiedi sempre la notifica di lettura</string>
+
     <string name="account_settings_quote_style_label">Aspetto testo quotato nelle risposte</string>
     <string name="account_settings_quote_style_prefix">Prefisso (come Gmail, Pine)</string>
     <string name="account_settings_quote_style_header">Intestazione (come Outlook, Yahoo!, Hotmail)</string>
@@ -921,6 +927,9 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="count_search_title">Conta i risultati della ricerca</string>
     <string name="count_search_summary">Disattiva per una visualizzazione più veloce</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - Con stella</string>
     <string name="unread_modifier"> - Non letto</string>
@@ -1021,6 +1030,24 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="dialog_confirm_delete_confirm_button">Elimina</string>
     <string name="dialog_confirm_delete_cancel_button">Non eliminare</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">Registrazione dei log per il debug di Android abilitata</string>
@@ -1028,4 +1055,10 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Impossibile connettersi.</string>
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a18a7b234..401b83e74 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -6,9 +6,7 @@
     <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_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">以下のライブラリを利用しています: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">絵文字アイコン: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -23,7 +21,7 @@
     <string name="accounts_title">アカウント一覧</string>
     <string name="advanced">拡張機能</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
-    <string name="shortcuts_title">K-9 Accounts</string>
+    <string name="shortcuts_title">K-9 アカウント</string>
 
     <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
 
@@ -111,6 +109,9 @@
     <string name="view_hide_details_action">詳細の表示/非表示</string>
     <string name="add_cc_bcc_action">Cc/Bcc追加</string>
     <string name="edit_subject_action">件名編集</string>
+    <string name="read_receipt">開封確認</string>
+    <string name="read_receipt_enabled">開封確認を要求します</string>
+    <string name="read_receipt_disabled">開封確認を要求しません</string>
     <string name="add_attachment_action">添付追加</string>
     <string name="add_attachment_action_image">添付ファイル追加 (画像)</string>
     <string name="add_attachment_action_video">添付ファイル追加 (動画)</string>
@@ -133,7 +134,7 @@
     <string name="status_loading_folder">(取込中 <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_loading_more">メール取込中\u2026</string>
     <string name="status_network_error">接続エラー</string>
-    <string name="status_invalid_id_error">新着メールなし</string>
+    <string name="status_invalid_id_error">メッセージが見つかりません</string>
     <string name="status_error">エラー</string>
     <string name="status_sending">送信\u2026</string>
 
@@ -188,13 +189,13 @@
 
     <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 はメール送信中にトラブルが発生しました．
-     メッセージが送信されたかどうかについては、トラブルに応じるため不明です．
-      送信宛先は、メールを既に受信している場合があります．
-    \u000a\u000a送信済みトレイにトラブルで発生したメールを格納します．
-    フラグ解除されたメールを再送信することができます．
-    送信済みトレイを長く押下することで「メール送信」メニューを表示させて送信することができます．\u000A\u000a
-    <xliff:g id="errorFolder">%s</xliff:g> フォルダには失敗したエラーメッセージが含まれています．</string>
+    <string name="send_failure_body_fmt">メール送信中に問題が発生しました。
+    問題の性質により、メッセージが送信されたかどうかがわかりません。
+    受信者は、そのメッセージを既に受信しているかもしれません。
+    \u000a\u000a問題が発生したメールには送信トレイにスターが付いています。
+    スターを取ることで、メールを再送することができます。
+    他のメッセージを送信するには、「メール送信」メニューを表示させるために送信トレイを長押ししてください。\u000A\u000a
+    <xliff:g id="errorFolder">%s</xliff:g> フォルダにはその問題に関するエラーメッセージが含まれています。</string>
 
     <string name="alert_header">K-9 警告</string>
     <string name="no_connection_alert">送信ネットワークのリソース不足のため同期処理中断</string>
@@ -231,7 +232,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="debug_enable_debug_logging_title">拡張デバッグログ</string>
     <string name="debug_enable_debug_logging_summary">追加診断情報ログ</string>
     <string name="debug_enable_sensitive_logging_title">詳細情報ログ</string>
-    <string name="debug_enable_sensitive_logging_summary">ログにパスワードが表示されるかもしれません</string>
+    <string name="debug_enable_sensitive_logging_summary">ログにパスワードが表示される</string>
 
     <string name="message_header_mua">K-9 for Android </string>
 
@@ -259,15 +260,17 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_compose_content_hint">本文</string>
     <string name="message_compose_quote_header_separator">-------- 元メール --------</string>
     <string name="message_compose_quote_header_subject">件名:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">送信日:</string>
     <string name="message_compose_quote_header_from">送信者:</string>
     <string name="message_compose_quote_header_to">宛先:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
     <string name="message_compose_quoted_text_label">テキスト引用</string>
     <string name="message_compose_error_no_recipients">少なくとも1つの受信者を追加する必要があります</string>
-    <string name="message_compose_downloading_attachments_toast">一部の添付ファイルをダウンロードしていません．このメールが送信される前に自動的にダウンロードされます．</string>
-    <string name="message_compose_attachments_skipped_toast">ダウンロードしていないため、一部の添付ファイルを転送することはできません．</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>
 
 
 
@@ -292,9 +295,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="message_view_download_remainder">すべてダウンロード</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="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>
@@ -317,7 +320,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
 
     <string name="global_settings_flag_label">スターを表示</string>
-    <string name="global_settings_flag_summary">スターは印を付けたメッセージを示します</string>
+    <string name="global_settings_flag_summary">スターは印の付いたメッセージを示す</string>
     <string name="global_settings_checkbox_label">複数選択チェックボックス</string>
     <string name="global_settings_checkbox_summary">複数選択チェックボックス常時表示</string>
     <string name="global_settings_touchable_label">メッセージプレビュー</string>
@@ -332,7 +335,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <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_fixedwidth_summary">プレーンテキストメッセージの表示に固定幅フォントを利用</string>
     <string name="global_settings_messageview_return_to_list_label">削除後メッセージ一覧へ戻る</string>
     <string name="global_settings_messageview_return_to_list_summary">メッセージの削除後、メッセージ一覧に戻る</string>
 
@@ -341,6 +344,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="global_settings_confirm_action_archive">アーカイブ</string>
     <string name="global_settings_confirm_action_delete">削除(メッセージ表示画面のみ)</string>
     <string name="global_settings_confirm_action_spam">迷惑メール</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">すべて既読にする</string>
     <string name="global_settings_confirm_action_send">送信</string>
 
     <string name="global_settings_privacy_mode_title">スクリーンロック時の通知</string>
@@ -348,7 +352,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
 
     <string name="quiet_time">夜間時間帯</string>
-    <string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定します．</string>
+    <string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定</string>
     <string name="quiet_time_starts">開始時刻</string>
     <string name="quiet_time_ends">終了時刻</string>
 
@@ -489,7 +493,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="push_poll_on_connect_label">プッシュ接続時の同期</string>
     <string name="account_setup_options_enable_push_label">このアカウントにプッシュメールを有効化</string>
-    <string name="account_setup_options_enable_push_summary">メールサーバがサポートしていれば新しいメッセージは即座に表示されます．当オプションはパフォーマンスが改善もしくは低下します．</string>
+    <string name="account_setup_options_enable_push_summary">メールサーバがサポートしていれば新しいメッセージは即座に表示されます。当オプションはパフォーマンスが改善もしくは低下します。</string>
     <string name="idle_refresh_period_label">IMAP IDLE（プッシュ）接続のリフレッシュ</string>
     <string name="idle_refresh_period_1min">１分毎</string>
     <string name="idle_refresh_period_2min">２分毎</string>
@@ -559,6 +563,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="account_settings_composition">メール送信</string>
 
+    <string name="account_settings_default_quoted_text_shown_label">返信時に元のメッセージを引用する</string>
+    <string name="account_settings_default_quoted_text_shown_summary">返信するとき、元のメッセージをメールに挿入する</string>
+
     <string name="account_settings_reply_after_quote_label">引用テキストの後に返信を書く</string>
     <string name="account_settings_reply_after_quote_summary">返信するときに元のメッセージを返信の上に表示</string>
 
@@ -566,6 +573,9 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_message_format_text">テキスト(画像や書式は取り除く)</string>
     <string name="account_settings_message_format_html">HTML (画像や書式を保持)</string>
 
+    <string name="account_settings_message_read_receipt_label">開封確認</string>
+    <string name="account_settings_message_read_receipt_summary">常に開封確認を要求する</string>
+
     <string name="account_settings_quote_style_label">返信の引用スタイル</string>
     <string name="account_settings_quote_style_prefix">引用記号 (Gmail, Pine形式)</string>
     <string name="account_settings_quote_style_header">ヘッダ (Outlook, Yahoo!, Hotmail形式)</string>
@@ -582,7 +592,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_crypto_app_none">なし</string>
     <string name="account_settings_crypto_app_not_available">利用不可</string>
     <string name="account_settings_crypto_auto_signature">自動署名</string>
-    <string name="account_settings_crypto_auto_signature_summary">このアカウントのE-Mailアドレスから署名の鍵を自動的に決定する．</string>
+    <string name="account_settings_crypto_auto_signature_summary">このアカウントのE-Mailアドレスから署名の鍵を自動的に決定する</string>
 
     <string name="account_settings_mail_check_frequency_label">同期フォルダの同期間隔</string>
     <string name="account_settings_second_class_check_frequency_label">2nd クラス自動受信間隔</string>
@@ -598,7 +608,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
     <string name="account_settings_mail_display_count_label">一度に表示するメール数</string>
 
-    <string name="account_settings_autodownload_message_size_label">ダウンロードするメッセージの上限</string>
+    <string name="account_settings_autodownload_message_size_label">ダウンロードするメッセージサイズの上限</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>
@@ -611,6 +621,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="account_settings_autodownload_message_size_512">512Kb</string>
     <string name="account_settings_autodownload_message_size_1024">1Mb</string>
     <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_message_age_label">いつから同期するか</string>
@@ -839,7 +851,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="settings_messageview_mobile_layout_label">１列レイアウト</string>
     <string name="settings_messageview_mobile_layout_summary">小さい画面用にHTMLメッセージを再構成</string>
     <string name="settings_messageview_zoom_controls_label">ズーム制御</string>
-    <string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にします</string>
+    <string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にする</string>
 
 
 
@@ -908,10 +920,13 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="start_integrated_inbox_summary">起動後に統合フォルダを表示する</string>
 
     <string name="measure_accounts_title">アカウントのサイズ表示</string>
-    <string name="measure_accounts_summary">表示を早くしたい場合はチェックをはずしてください</string>
+    <string name="measure_accounts_summary">表示を速くしたい場合はチェックしない</string>
 
     <string name="count_search_title">検索結果の件数表示</string>
-    <string name="count_search_summary">表示を早くしたい場合はチェックをはずしてください</string>
+    <string name="count_search_summary">表示を速くしたい場合はチェックしない</string>
+
+    <string name="hide_special_accounts_title">特殊なアカウントを隠す</string>
+    <string name="hide_special_accounts_summary">統合フォルダと全メッセージを隠す</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"> - スター</string>
@@ -1013,11 +1028,31 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
     <string name="dialog_confirm_delete_confirm_button">削除する</string>
     <string name="dialog_confirm_delete_cancel_button">削除しない</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">迷惑メールフォルダへの移動の確認</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">本当にこのメッセージを迷惑メールフォルダに移動しますか？</item>
+        <item quantity="other">本当にこれら<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを迷惑メールフォルダに移動しますか？</item>
+<!--
+  Possible values for 'quantity': zero, one, two, few, many, other
+
+  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
+
+-->
+    </plurals>
+    <string name="dialog_confirm_spam_confirm_button">はい</string>
+    <string name="dialog_confirm_spam_cancel_button">いいえ</string>
+
+    <string name="dialog_attachment_progress_title">添付ファイルをダウンロードしています</string>
 
     <string name="debug_logging_enabled">Android のログにデバッグ用のログを出力するように設定しました。</string>
 
     <string name="messagelist_sent_to_me_sigil">\u00bb</string>
     <string name="messagelist_sent_cc_me_sigil">\u203a</string>
     <string name="error_unable_to_connect">接続できません</string>
+
+    <string name="account_unavailable">アカウント \"<xliff:g id="account">%s</xliff:g>\" は利用できません。ストレージを確認してください。</string>
+
+    <string name="settings_attachment_default_path">添付ファイルの保存先</string>
+    <string name="attachment_save_title">添付ファイルの保存先</string>
+    <string name="attachment_save_desc">ファイルブラウザがインストールされていません。添付ファイルの保存場所を直接入力してください。</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 000000000..7f4b5ac94
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,1055 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">K-9 메일</string>
+    <string name="beta_app_name">K-9 메일 베타</string>
+    <string name="app_authors_fmt">Authors: <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">K-9 메일은 아래의 서드파티 라이브러리를 이용합니다 : <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">K-9이 이메일의 첨부를 읽도록 합니다</string>
+    <string name="read_messages_label">이메일 읽기</string>
+    <string name="read_messages_desc">K-9이 이메일을 읽도록 합니다.</string>
+    <string name="delete_messages_label">이메일 삭제</string>
+    <string name="delete_messages_desc">K-9이 이메일을 삭제하도록 합니다</string>
+    
+     <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
+    <string name="accounts_title">계정</string>
+    <string name="advanced">고급</string>
+    <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
+    <string name="shortcuts_title">K-9 계정</string>
+    
+      <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
+
+    <string name="compose_title">작성</string>
+    <string name="debug_title">디버그</string>
+    <string name="choose_folder_title">폴더 선택</string>
+    <string name="choose_color_title">색 선택</string>
+
+    <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
+
+    <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
+    <string name="status_loading_account_folder">\u0020(수신 <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(헤더정보를 가져오는 중 <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(보내는 중 <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(다음 수신 @ <xliff:g id="nexttime">%s</xliff:g>)</string>
+    <string name="status_syncing_off">\u0020(동기화 실패)</string>
+
+    <!-- Actions will be used as buttons and in menu items -->
+    <string name="next_action">다음</string> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">이전</string> <!-- Used as part of a multi-step process -->
+    <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
+    <string name="cancel_action">취소</string>
+    <string name="send_action">전송</string>
+    <string name="send_again_action">재전송</string>
+    <string name="select_action">선택</string>
+    <string name="deselect_action">선택 해제</string>
+    <string name="reply_action">회신</string>
+    <string name="reply_all_action">전체회신</string>
+    <string name="delete_action">지우기</string>
+    <string name="archive_action">보관</string>
+    <string name="spam_action">스팸</string>
+    <string name="delete_all_action">폴더 비우기</string>
+    <string name="forward_action">전달</string>
+    <string name="move_action">이동</string>
+    <string name="continue_action">계속</string>
+    <string name="done_action">완료</string> <!--  Used to complete a multi-step process -->
+    <string name="remove_action">삭제</string>
+    <string name="discard_action">버리기</string>
+    <string name="save_draft_action">임시 보관함에 저장</string>
+    <string name="retry_action">재시도</string>
+    <string name="refresh_action">새로 읽기</string>
+    <string name="check_mail_action">새로고침</string>
+    <string name="send_messages_action">메시지 보내기</string>
+    <string name="list_folders_action">폴더 목록</string>
+    <string name="refresh_folders_action">폴더 다시읽기</string>
+    <string name="mark_all_as_read_action">모든 편지를 읽음으로 표시</string>
+    <string name="add_account_action">계정 추가</string>
+    <string name="compose_action">작성</string>
+    <string name="search_action">검색</string>
+    <string name="search_results">검색 결과</string>
+    <string name="preferences_action">설정</string>
+    <string name="open_action">열기</string>
+    <string name="account_settings_action">계정 설정</string>
+    <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>
+    <string name="back_to_accounts_action">◀</string>
+    <string name="back_to_folder_list_action">◀</string>
+    <string name="read_action">읽기</string>
+    <string name="mark_as_read_action">읽은 메일로 표시</string>
+    <string name="send_alternate_action">공유</string>
+    <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>
+    <string name="show_full_header_action">헤더 보기</string>
+    <string name="hide_full_header_action">헤더 숨기기</string>
+    <string name="select_text_action">텍스트 선택</string>
+
+    <string name="mark_as_unread_action">읽지 않은 메일로 표시</string>
+    <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="add_attachment_action">첨부 추가</string>
+    <string name="add_attachment_action_image">첨부 추가 (이미지)</string>
+    <string name="add_attachment_action_video">첨부 추가 (비디오)</string>
+    <string name="dump_settings_action">Dump settings</string>
+    <string name="empty_trash_action">휴지통 비우기</string>
+    <string name="expunge_action">삭제(expunge)</string>
+    <string name="clear_local_folder_action">로컬 메시지 삭제</string>
+    <string name="set_sort_action">정렬방식 선택</string>
+    <string name="reverse_sort_action">반대로 정렬</string>
+    <string name="about_action">About</string>
+
+    <string name="prefs_title">설정</string>
+    <string name="accounts_context_menu_title">계정 옵션</string>
+    <string name="folder_context_menu_title">폴더 옵션</string>
+
+    <string name="general_no_subject">(제목 없음)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
+    <string name="general_no_date">날짜 없음</string>
+    <string name="general_no_sender">보낸이 없음</string>
+    <string name="status_loading">수신중</string>
+    <string name="status_loading_folder">(수신 <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
+    <string name="status_loading_more">이메일을 가져오는 중..\u2026</string>
+    <string name="status_network_error">연결 오류</string>
+    <string name="status_invalid_id_error">메시지를 찾을 수 없습니다</string>
+    <string name="status_error">오류</string> <!-- Used in Outbox when a message has failed to send -->
+    <string name="status_sending">전송중</string> <!-- Used in Outbox when a message is currently sending -->
+
+    <string name="status_loading_more_failed">메시지 로딩 실패</string>
+
+    <string name="load_more_messages_fmt"><xliff:g id="messages_to_load">%d</xliff:g>개 이메일 더 불러오기</string>
+
+    <string name="abbrev_gigabytes">GB</string>
+    <string name="abbrev_megabytes">MB</string>
+    <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="compacting_account">계정 최적화(compact) \"<xliff:g id="account">%s</xliff:g>\"</string>
+    <string name="clearing_account">계정 비우기(clearing) \"<xliff:g id="account">%s</xliff:g>\"</string>
+    <string name="recreating_account">계정 재생성 \"<xliff:g id="account">%s</xliff:g>\"</string>
+
+    <string name="notification_new_title">새 이메일</string>
+    <string name="notification_new_scrolling">새 이메일 <xliff:g id="sender">%s</xliff:g></string>
+    <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> 통의 읽지 않은 메일 (<xliff:g id="account">%s</xliff:g>)</string> <!-- 279 Unread (someone@google.com) -->
+    <string name="notification_new_one_account_unknown_unread_count_fmt"><xliff:g id="new_message_count">%d</xliff:g> 개 새 이메일 (<xliff:g id="account">%s</xliff:g>)</string> <!-- 2 New Email(s) (someone@google.com) -->
+    <string name="notification_new_multi_account_fmt">in <xliff:g id="number_accounts">%d</xliff:g> accounts</string>
+    <string name="notification_unsent_title">메시지가 전송되지 않았습니다</string>
+
+    <string name="notification_bg_sync_ticker">메일 체크중: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
+    <string name="notification_bg_sync_title">메일 체크중</string>
+    <string name="notification_bg_send_ticker">메일 전송중: <xliff:g id="account">%s</xliff:g></string>
+    <string name="notification_bg_send_title">메일 전송중</string>
+    <string name="notification_bg_title_separator">:</string>
+
+    <string name="special_mailbox_name_inbox">받은 메일함</string>
+    <string name="special_mailbox_name_outbox">보낸 메일함</string>
+    <!-- The following mailbox names will be used if the user has not specified one from the server -->
+    <string name="special_mailbox_name_drafts">임시 메일함</string>
+    <string name="special_mailbox_name_trash">휴지통</string>
+    <string name="special_mailbox_name_sent">보낸 메일함</string>
+    <string name="special_mailbox_name_archive">보관</string>
+    <string name="special_mailbox_name_spam">스팸메일함</string>
+    <!-- Mailbox names displayed to user -->
+
+    <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (임시보관함)</string>
+    <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Trash)</string>
+    <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Sent)</string>
+    <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>
+    <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
+
+    <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에서 메시지를 보내는데 문제가 발생하였습니다.
+    하지만 문제의 특성상 K-9은 메시지가 확실히 보내졌는지 여부를 확인할 수 없습니다. 
+	수신자는 이미 메시지를 받았을 수도 있습니다.
+    \u000a\u000a발생된 문제 유형의 메시지는 보낸편지함에 즐겨찾기(stared) 표시가 되어있습니다.
+    이 즐겨찾기(stared)를 없애면 K-9은 메시지를 재전송을 시도할것입니다.
+	다른 발신 작업을 하기위해서는 보낸편지함을 길게 눌러 메시지 보내기를 찾으십시오.\u000A\u000a
+	<xliff:g id="errorFolder">%s</xliff:g> 폴더에 실패에 대한 에러메시지가 있습니다.</string>
+
+    <string name="alert_header">K-9 알람</string>
+    <string name="no_connection_alert">네트워크 문제로 동기화, 메일보내기가 지연되고있습니다.</string>
+
+    <string name="end_of_folder">더 이상 없음</string>
+
+    <string name="accounts_welcome">
+K-9 메일 설치를 환영합니다.  K-9은 표준 안드로이드 메일 클라이언트를 기반으로 한 안드로이드용 오픈소스 메일 클라이언트 입니다.
+\n
+\n\nK-9의 향상된 기능:
+\n * IMAP IDLE를 이용한 메일 푸시(PUSH)기능
+\n * 더 나은 성능
+\n * 메시지 재정리
+\n * 이메일 서명
+\n * Bcc-to-self
+\n * 폴더 구독
+\n * 모든 폴더 동기화
+\n * 회신주소 수정
+\n * 키보드 단축
+\n * 향상된 IMAP 지원
+\n * SD 카드에 첨부파일 저장
+\n * 휴지통 비우기
+\n * 메시지 정렬
+\n * ...그리고 그 밖에
+\n
+\nK-9 메일은 다른 메일 클라이언트와 마찬가지로 대부분의 무료 hotmail 계정을 Microsoft Exchange와 연결할때 발생되는 문제로 인해 지원하지 않습니다. 
+\n
+\n 버그 리포트, 새로운 기능 그리고 질문에 대한 문의는 http://k9mail.googlecode.com/ 로 남겨주시기바랍니다.
+
+</string>
+
+    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="debug_enable_debug_logging_title">버그 정보 기록</string>
+    <string name="debug_enable_debug_logging_summary">추가적인 정보를 기록합니다.</string>
+    <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 -->
+
+    <string name="message_list_title_fmt"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g>
+                       <xliff:g id="unread_count">%s</xliff:g>
+                       <xliff:g id="polling">%s</xliff:g>
+                       <xliff:g id="sending">%s</xliff:g>
+                       <xliff:g id="push">%s</xliff:g></string>
+    <string name="message_list_load_more_messages_action">메시지 추가 로드</string>
+    <string name="message_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_list_delete_action">지우기</string>
+    <string name="message_list_mark_read_action">읽음으로 표시</string>
+    <string name="message_list_mark_unread_action">읽지 않음으료 표시</string>
+    <string name="message_list_flag_action">즐겨찾기 등록</string>
+    <string name="message_list_unflag_action">즐겨찾기 해제</string>
+
+    <string name="message_compose_to_hint">받는 사람</string>
+    <string name="message_compose_cc_hint">참조</string>
+    <string name="message_compose_bcc_hint">숨은 참조</string>
+    <string name="message_compose_subject_hint">제목</string>
+    <string name="message_compose_content_hint">내용</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>
+    <string name="message_compose_quote_header_from">보낸 사람:</string>
+    <string name="message_compose_quote_header_to">받는 사람:</string>
+    <string name="message_compose_quote_header_cc">참조:</string>
+    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
+    <string name="message_compose_quoted_text_label">Quoted text</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_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>
+    <string name="message_view_cc_label">참조:</string>
+    <string name="message_view_attachment_view_action">열기</string>
+    <string name="message_view_attachment_download_action">저장</string>
+    <string name="message_view_prev_action">\u25BC</string>
+    <string name="message_view_next_action">\u25B2</string>
+    <string name="message_view_archive_action">보관</string>
+    <string name="message_view_move_action">이동</string>
+    <string name="message_view_spam_action">스팸</string>
+    <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
+    <string name="message_view_status_attachment_saved">첨부파일이 SD카드에 <xliff:g id="filename">%s</xliff:g> 로 저장되었습니다.</string>
+    <string name="message_view_status_attachment_not_saved">첨부파일을 SD카드에 저장할 수 없습니다.</string>
+    <string name="message_view_show_pictures_instructions">포함된 그림을 보기위해서는  \"그림 보기\" 버튼을 누르십시오.</string>
+    <string name="message_view_show_pictures_action">그림 보기</string>
+    <string name="message_view_fetching_attachment_toast">첨부파일 가져오는 중.</string>
+    <string name="message_view_no_viewer"><xliff:g id="mimetype">%s</xliff:g>에 대한 뷰어를 찾을 수 없습니다.</string>
+
+
+    <string name="message_view_download_remainder">다운로드 완료 메시지</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">모든 헤더의 다운로드 혹은 저장이 완료 되지않았습니다. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future.</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>
+
+    <string name="new_mailbox_dlg_title">새 폴더 이름</string>
+
+    <string name="folder_push_active_symbol">(Push)</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>
+    <string name="message_discarded_toast">삭제됨</string>
+    <string name="message_saved_toast">임시보관함에 저장되었습니다</string>
+    <string name="message_delete_failed">삭제 실패</string>
+
+    <string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="about_version">버전: <xliff:g id="version">%s</xliff:g></string>
+
+
+    <string name="global_settings_flag_label">즐겨찾기 보기</string>
+    <string name="global_settings_flag_summary">체크된 메시지 즐겨찾기등록</string>
+    <string name="global_settings_checkbox_label">체크박스 여러게 선택하기</string>
+    <string name="global_settings_checkbox_summary">여러게 선택하기를 항상보여줍니다.</string>
+    <string name="global_settings_touchable_label">메시지 미리보기</string>
+    <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">주소록(Contact) 이름 보기</string>
+    <string name="global_settings_show_contact_name_summary">받는사람 이름을 주소록(Contact)에서 가져옵니다.</string>
+    <string name="global_settings_registered_name_color_label">주소록 색표시</string>
+    <string name="global_settings_registered_name_color_default">주소록(Contact) 목록에 있는 이름에 색표시 하지않음</string>
+    <string name="global_settings_registered_name_color_changed">주소록(Contact) 목록에 있는 이름에 색표시</string>
+
+    <string name="global_settings_messageview_fixedwidth_label">고정 넓이 폰트</string>
+    <string name="global_settings_messageview_fixedwidth_summary">일반텍스트(Plain) 메시지를 보여줄때 고정 넓이 폰트사용</string>
+    <string name="global_settings_messageview_return_to_list_label">삭제후 목록으로</string>
+    <string name="global_settings_messageview_return_to_list_summary">메시지 삭제후에 메시지 목록으로 되돌아갑니다.</string>
+
+    <string name="global_settings_confirm_actions_title">동작시 행동</string>
+    <string name="global_settings_confirm_actions_summary">설정한 행동을 할 경우 확인창을 보여줍니다.</string>
+    <string name="global_settings_confirm_action_archive">보관</string>
+    <string name="global_settings_confirm_action_delete">삭제 (message view only)</string>
+    <string name="global_settings_confirm_action_spam">스팸</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">모든 편지를 읽음으로 표시</string>
+    <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>
+    <string name="quiet_time_description">벨소리, 부져, 플래쉬를 밤시간에 사용하지않습니다</string>
+    <string name="quiet_time_starts">무음 시작 시간</string>
+    <string name="quiet_time_ends">무음 끝나는 시간</string>
+
+
+    <string name="account_setup_basics_title">계정 추가</string>
+    <string name="account_setup_basics_instructions">이메일 계정을 입력하시오:</string>
+    <string name="account_setup_basics_instructions2_fmt">(<xliff:g id="number_accounts">%d</xliff:g>개의 계정을 추가하였습니다.)</string>
+    <string name="account_setup_basics_email_hint">이메일 주소</string>
+    <string name="account_setup_basics_email_error_invalid_fmt"><xliff:g id="email">%s</xliff:g> 유효하지 않은 이메일 주소입니다.</string>
+    <string name="account_setup_basics_email_error_duplicate_fmt"><xliff:g id="email">%s</xliff:g>는 이미 등록되있습니다.</string>
+    <string name="account_setup_basics_password_hint">비밀번호</string>
+    <string name="account_setup_basics_default_label">기본 이메일로 설정</string>
+    <string name="account_setup_basics_manual_setup_action">수동 설정</string>
+
+    <string name="account_setup_check_settings_title"></string>
+    <string name="account_setup_check_settings_retr_info_msg">계정 정보 복구\u2026</string>
+    <string name="account_setup_check_settings_check_incoming_msg">수신 서버 설정 확인중\u2026</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">발신 서버 설정 확인중\u2026</string>
+    <string name="account_setup_check_settings_authenticate">인증중\u2026</string>
+    <string name="account_setup_check_settings_fetch">계정설정 가져오기\u2026</string>
+    <string name="account_setup_check_settings_finishing_msg">완료중\u2026</string>
+    <string name="account_setup_check_settings_canceling_msg">취소중\u2026</string>
+
+    <string name="account_setup_names_title">설정이 거의 완료되었습니다!</string>
+    <string name="account_setup_names_instructions">계정이 설정되었습니다. 순조롭게 진행중입니다!</string>
+    <string name="account_setup_names_account_name_label">이 계정의 이름을 입력 (옵션):</string>
+    <string name="account_setup_names_user_name_label">이름 입력 (보내는 메시지에 표시 될 이름):</string>
+
+    <string name="account_setup_finished_toast">계정 설정완료!\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>
+    <string name="account_setup_account_type_imap_action">IMAP</string>
+    <string name="account_setup_account_type_webdav_action">Exchange (WebDAV)</string>
+
+    <string name="account_setup_incoming_title">받기 서버 설정</string>
+    <string name="account_setup_incoming_username_label">아이디</string>
+    <string name="account_setup_incoming_password_label">비밀번호</string>
+    <string name="account_setup_incoming_pop_server_label">POP3 서버</string>
+    <string name="account_setup_incoming_imap_server_label">IMAP 서버</string>
+    <string name="account_setup_incoming_webdav_server_label">Exchange 서버</string>
+    <string name="account_setup_incoming_port_label">포트 번호</string>
+    <string name="account_setup_incoming_security_label">보안 연결</string>
+    <string name="account_setup_incoming_auth_type_label">인증 방식</string>
+    <string name="account_setup_incoming_security_none_label">없음</string>
+    <string name="account_setup_incoming_security_ssl_optional_label">SSL (유효할경우)</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL (모든 인증서 허용)</string>
+    <string name="account_setup_incoming_security_tls_optional_label">TLS (유효할경우)</string>
+    <string name="account_setup_incoming_security_tls_label">TLS (모든 인증서 허용)</string>
+
+    <string name="account_setup_incoming_delete_policy_label">메시지 삭제시</string>
+    <string name="account_setup_incoming_delete_policy_never_label">서버에는 메일을 삭제하지않음</string>
+    <string name="account_setup_incoming_delete_policy_7days_label">7일 이후</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">서버에도 메일 삭제</string>
+    <string name="account_setup_incoming_delete_policy_markread_label">서버에 읽은 메일로 표시</string>
+
+    <string name="account_setup_incoming_compression_label">네트워크상에서 압축 사용:</string>
+    <string name="account_setup_incoming_mobile_label">Mobile</string>
+    <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
+    <string name="account_setup_incoming_other_label">Other</string>
+
+    <string name="account_setup_incoming_save_all_headers_title">헤더정보 다운로드</string>
+    <string name="account_setup_incoming_save_all_headers_label">모든 메시지의 헤더정보를 로컬에 저장</string>
+
+    <string name="local_storage_provider_external_label">외부 저장장치(SD card)</string>
+    <string name="local_storage_provider_internal_label">일반적인 내부 저장장치</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s 추가적인 내부 저장장치</string>
+    <string name="local_storage_provider_label">저장 위치</string>
+
+    <string name="account_setup_expunge_policy_label">삭제된 메시지를 없앰(Expunge)</string>
+    <string name="account_setup_expunge_policy_immediately">즉시</string>
+    <string name="account_setup_expunge_policy_on_poll">수신시(poll)</string>
+    <string name="account_setup_expunge_policy_manual">항상 수동적으로</string>
+
+    <string name="account_setup_incoming_imap_path_prefix_label">IMAP path prefix</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint">(NAMESPACE가 이용가능할경우 자동으로 이용)</string>
+
+    <string name="drafts_folder_label">임시보관함 폴더</string>
+    <string name="sent_folder_label">보낸 편지함 폴더</string>
+    <string name="trash_folder_label">휴지통 폴더</string>
+    <string name="archive_folder_label">보관 폴더</string>
+    <string name="spam_folder_label">스팸 폴더</string>
+
+    <string name="account_setup_incoming_subscribed_folders_only_label">설정한 폴더만 보기</string>
+    <string name="account_setup_auto_expand_folder">폴더 자동 펼치기</string>
+
+    <string name="account_setup_incoming_webdav_path_prefix_label">OWA 경로</string>
+    <string name="account_setup_incoming_webdav_path_prefix_hint">옵션</string>
+
+    <string name="account_setup_incoming_webdav_auth_path_label">인증 경로</string>
+    <string name="account_setup_incoming_webdav_auth_path_hint">옵션</string>
+    <string name="account_setup_incoming_webdav_mailbox_path_label">Mailbox alias</string>
+    <string name="account_setup_incoming_webdav_mailbox_path_hint">옵션</string>
+
+    <string name="account_setup_outgoing_title">보내기 서버 설정</string>
+    <string name="account_setup_outgoing_smtp_server_label">SMTP 서버</string>
+    <string name="account_setup_outgoing_port_label">포트번호</string>
+    <string name="account_setup_outgoing_security_label">보안 유형</string>
+    <string name="account_setup_outgoing_security_none_label">없음</string>
+    <string name="account_setup_outgoing_security_ssl_label">SSL</string>
+    <string name="account_setup_outgoing_security_tls_optional_label">TLS (유효할 경우)</string>
+    <string name="account_setup_outgoing_security_tls_label">TLS (모든 인증서 허용)</string>
+    <string name="account_setup_outgoing_require_login_label">sign-in 필요.</string>
+    <string name="account_setup_outgoing_username_label">이름</string>
+    <string name="account_setup_outgoing_password_label">비밀번호</string>
+    <string name="account_setup_outgoing_authentication_label">인증 유형</string>
+    <!-- The authentication strings below are for a planned (hopefully) change to the above username and password options -->
+    <string name="account_setup_outgoing_authentication_basic_label">아이디 &amp; 비밀번호</string>
+    <string name="account_setup_outgoing_authentication_basic_username_label">아이디</string>
+    <string name="account_setup_outgoing_authentication_basic_password_label">비밀번호</string>
+    <string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
+    <string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
+    <string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
+
+    <string name="account_setup_bad_uri">잘못된 설정: <xliff:g id="err_mess">%s</xliff:g></string>
+
+    <string name="account_setup_options_title">계정 옵션</string>
+
+    <string name="compact_action">최적화</string>
+    <string name="clear_action">편지 비우기 (위험!)</string>
+    <string name="recreate_action">데이터 재생성 (Last Resort!)</string>
+
+    <string name="account_setup_options_mail_check_frequency_label">폴더 수신(poll) 빈도</string>
+    <!-- Frequency also used in account_settings_* -->
+    <string name="account_setup_options_mail_check_frequency_never">하지않음</string>
+    <string name="account_setup_options_mail_check_frequency_1min">매 1분 마다</string>
+    <string name="account_setup_options_mail_check_frequency_5min">매 5분 마다</string>
+    <string name="account_setup_options_mail_check_frequency_10min">매 10분 마다</string>
+    <string name="account_setup_options_mail_check_frequency_15min">매 15분 마다</string>
+    <string name="account_setup_options_mail_check_frequency_30min">매 30분 마다</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">매 시간 마다</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">6시간 마다</string>
+    <string name="account_setup_options_mail_check_frequency_12hour">12시간 마다</string>
+    <string name="account_setup_options_mail_check_frequency_24hour">24시간 마다</string>
+
+    <string name="push_poll_on_connect_label">push접속시 수신</string>
+    <string name="account_setup_options_enable_push_label">이 계정의 메일에 대해 push 하도록함</string>
+    <string name="account_setup_options_enable_push_summary">만약 해당 계정서버가 push를 지원할경우 새로운 메시지가 있을경우 바로 보여질것입니다. 이  기능은 성능을 매우 향상시킬수 있습니다.</string>
+    <string name="idle_refresh_period_label">IDLE 연결을 재생(refresh)</string>
+    <string name="idle_refresh_period_1min">매 1분 마다</string>
+    <string name="idle_refresh_period_2min">매 2분 마다</string>
+    <string name="idle_refresh_period_3min">매 3분 마다</string>
+    <string name="idle_refresh_period_6min">매 6분 마다</string>
+    <string name="idle_refresh_period_12min">매 12분 마다</string>
+    <string name="idle_refresh_period_24min">매 24분 마다</string>
+    <string name="idle_refresh_period_36min">매 36분 마다</string>
+    <string name="idle_refresh_period_48min">매 48분 마다</string>
+    <string name="idle_refresh_period_60min">매 60분 마다</string>
+
+    <string name="account_setup_options_default_label">보내기 기본 계정으로 사용합니다.</string>
+    <string name="account_setup_options_notify_label">메일 도착시 알림</string>
+    <string name="account_setup_options_notify_sync_label">메일 확인시 알림</string>
+
+    <!-- Number of displayed messages, also used in account_settings_* -->
+    <string name="account_setup_options_mail_display_count_label">화면에 보여질 메시지 수</string>
+    <string name="account_setup_options_mail_display_count_10">10 메시지</string>
+    <string name="account_setup_options_mail_display_count_25">25 메시지</string>
+    <string name="account_setup_options_mail_display_count_50">50 메시지</string>
+    <string name="account_setup_options_mail_display_count_100">100 메시지</string>
+    <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="move_copy_cannot_copy_unsynced_message">서버와 동기화 되지않은 메시지를 복사하거나 이동할 수 없습니다.</string>
+
+    <string name="account_setup_failed_dlg_title">설정이 완료되지 않았습니다</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">아이디 혹은 비밀번호가 틀림.\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">서버에 안전하게 연결할 수 없습니다.\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">서버에 연결할 수 없습니다.\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">내용 수정</string>
+    <string name="account_setup_failed_dlg_continue_action">계속</string>
+
+    <string name="account_settings_push_advanced_title">고급</string>
+    <string name="account_settings_title_fmt">계정 설정</string>
+    <string name="account_settings_default">기본 계정</string>
+    <string name="account_settings_default_label">기본 계정</string>
+    <string name="account_settings_default_summary">보내기 기본 계정으로 사용합니다.</string>
+    <string name="account_settings_notify_label">새 메일 알림</string>
+    <string name="account_settings_notify_sync_label">동기화 알림</string>
+    <string name="account_settings_email_label">당신의 이메일 주소</string>
+    <string name="account_settings_notify_summary">메일 도착시 상태바에 알림</string>
+    <string name="account_settings_notify_sync_summary">동기화 확인중일때 상태바에 알림</string>
+    <string name="account_settings_show_combined_label">Show combined Inbox</string>
+    <string name="account_settings_notify_self_label">보낸편지함 포함</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>
+
+    <string name="account_settings_hide_buttons_label">네비게이션 버튼을 스크롤</string>
+    <string name="account_settings_hide_buttons_never">하지않음</string>
+    <string name="account_settings_hide_buttons_keyboard_avail">키보드를 이용가능할 경우</string>
+    <string name="account_settings_hide_buttons_always">항상</string>
+
+    <string name="account_settings_enable_move_buttons_label">재정리(refile) 버튼 활성화</string>
+    <string name="account_settings_enable_move_buttons_summary">보관, 이동, 스팸 버튼을 보이기</string>
+    <string name="account_settings_hide_move_buttons_label">재정리(refile) 보튼을 스크롤</string>
+
+    <string name="account_settings_show_pictures_label">항상 그림 보기</string>
+    <string name="account_settings_show_pictures_never">아니오</string>
+    <string name="account_settings_show_pictures_only_from_contacts">주소록에 등록된 경우</string>
+    <string name="account_settings_show_pictures_always">항상</string>
+
+    <string name="account_settings_composition">메일 보내기</string>
+
+    <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>
+    <string name="account_settings_reply_after_quote_summary">메시지 회신시 원본 메시지를 회신메시지에 포함시킵니다.</string>
+
+    <string name="account_settings_message_format_label">메시지 형식</string>
+    <string name="account_settings_message_format_text">일반 텍스트(Plain) (이미지와 꾸밈format은 없어집니다)</string>
+    <string name="account_settings_message_format_html">HTML (이미지와 꾸밈format이 보존됩니다)</string>
+
+    <string name="account_settings_quote_style_label">회신시 인용문 위치</string>
+    <string name="account_settings_quote_style_prefix">Prefix (Gmail, Pine 처럼)</string>
+    <string name="account_settings_quote_style_header">Header (Outlook, Yahoo!, Hotmail 처럼)</string>
+
+    <string name="account_settings_general_title">일반 설정</string>
+    <string name="account_settings_display_prefs_title">화면</string>
+    <string name="account_settings_sync">메일 가져오기</string>
+    <string name="account_settings_folders">폴더</string>
+    <string name="account_settings_message_lists">메시지 목록</string>
+    <string name="account_settings_message_view">메시지 보기</string>
+    <string name="account_settings_quote_prefix_label">본문 앞에</string>
+    <string name="account_settings_crypto">암호화 방법</string>
+    <string name="account_settings_crypto_app">OpenPGP Provider</string>
+    <string name="account_settings_crypto_app_none">없음</string>
+    <string name="account_settings_crypto_app_not_available">이용 불가</string>
+    <string name="account_settings_crypto_auto_signature">Auto-sign</string>
+    <string name="account_settings_crypto_auto_signature_summary">계정의 이메일 주소를 서명키를 추측할 수 있도록 사용.</string>
+
+    <string name="account_settings_mail_check_frequency_label">폴더 수신(poll) 빈도</string>
+    <string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>
+
+    <string name="account_settings_storage_title">저장장치</string>
+
+
+    <string name="account_settings_color_label">계정 색깔</string>
+    <string name="account_settings_color_summary">계정 목록과 폴더내에서 사용될 계정 색깔을 선택하시오.</string>
+
+    <string name="account_settings_led_color_label">알림 LED 색깔</string>
+    <string name="account_settings_led_color_summary">이 계정에 대해 깜빡일 LED 색을 선택하시오.</string>
+
+    <string name="account_settings_mail_display_count_label">로컬 폴더 용량</string>
+
+    <string name="account_settings_autodownload_message_size_label">가져올 메시지 최대용량</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>
+    <string name="account_settings_autodownload_message_size_8">8Kb</string>
+    <string name="account_settings_autodownload_message_size_16">16Kb</string>
+    <string name="account_settings_autodownload_message_size_32">32Kb</string>
+    <string name="account_settings_autodownload_message_size_64">64Kb</string>
+    <string name="account_settings_autodownload_message_size_128">128Kb</string>
+    <string name="account_settings_autodownload_message_size_256">256Kb</string>
+    <string name="account_settings_autodownload_message_size_512">512Kb</string>
+    <string name="account_settings_autodownload_message_size_1024">1Mb</string>
+    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
+    <string name="account_settings_autodownload_message_size_any">any size (제한없음)</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">최근 1주</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">최근 1달</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">최근 1년</string>
+
+
+    <string name="account_settings_folder_display_mode_label">보여질 폴더</string>
+    <string name="account_settings_folder_display_mode_all">모든 폴더</string>
+    <string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
+    <string name="account_settings_folder_display_mode_first_and_second_class">1st and 2nd Class folders</string>
+    <string name="account_settings_folder_display_mode_not_second_class">All except 2nd Class folders</string>
+
+    <string name="account_settings_folder_sync_mode_label">폴링(Poll)할 폴더Poll</string>
+    <string name="account_settings_folder_sync_mode_all">모든 폴더</string>
+    <string name="account_settings_folder_sync_mode_first_class">Only 1st Class folders</string>
+    <string name="account_settings_folder_sync_mode_first_and_second_class">1st and 2nd Class folders</string>
+    <string name="account_settings_folder_sync_mode_not_second_class">All except 2nd Class folders</string>
+    <string name="account_settings_folder_sync_mode_none">없음</string>
+
+    <string name="account_settings_folder_push_mode_label">푸시(Push)할 폴더</string>
+    <string name="account_settings_folder_push_mode_all">모든 폴더</string>
+    <string name="account_settings_folder_push_mode_first_class">Only 1st Class folders</string>
+    <string name="account_settings_folder_push_mode_first_and_second_class">1st and 2nd Class folders</string>
+    <string name="account_settings_folder_push_mode_not_second_class">All except 2nd Class folders</string>
+    <string name="account_settings_folder_push_mode_none">없음</string>
+
+    <string name="account_settings_folder_target_mode_label">이동/복사 메시지가 저장될 폴더</string>
+    <string name="account_settings_folder_target_mode_all">모든 폴더</string>
+    <string name="account_settings_folder_target_mode_first_class">Only 1st Class folders</string>
+    <string name="account_settings_folder_target_mode_first_and_second_class">1st and 2nd Class folders</string>
+    <string name="account_settings_folder_target_mode_not_second_class">All except 2nd Class folders</string>
+
+    <string name="account_settings_sync_remote_deletetions_label">서버에서의 삭제 동기화</string>
+    <string name="account_settings_sync_remote_deletetions_summary">서버에서 메시지가 삭제되있을 경우 메시지를 삭제합니다</string>
+
+    <string name="folder_settings_title">폴더 설정</string>
+
+    <string name="folder_settings_in_top_group_label">첫번째 그룹에 보여짐</string>
+    <string name="folder_settings_in_top_group_summary">폴더 목록의 가장 위에 보여짐</string>
+
+    <string name="folder_settings_folder_display_mode_label">폴더 디스플레이 클래스(Class)</string>
+    <string name="folder_settings_folder_display_mode_normal">없음</string>
+    <string name="folder_settings_folder_display_mode_first_class">1st Class</string>
+    <string name="folder_settings_folder_display_mode_second_class">2nd Class</string>
+
+    <string name="folder_settings_folder_sync_mode_label">폴더 동기화 클래스(Class)</string>
+    <string name="folder_settings_folder_sync_mode_normal">없음</string>
+    <string name="folder_settings_folder_sync_mode_first_class">1st Class</string>
+    <string name="folder_settings_folder_sync_mode_second_class">2nd Class</string>
+    <string name="folder_settings_folder_sync_mode_inherited">Same as display class</string>
+
+    <string name="folder_settings_folder_push_mode_label">폴더 푸시(Push) 클래스(Class)</string>
+    <string name="folder_settings_folder_push_mode_normal">없음</string>
+    <string name="folder_settings_folder_push_mode_first_class">1st Class</string>
+    <string name="folder_settings_folder_push_mode_second_class">2nd Class</string>
+    <string name="folder_settings_folder_push_mode_inherited">동기화 클래스와 같음</string>
+
+    <string name="account_settings_incoming_label">받기 서버</string>
+    <string name="account_settings_incoming_summary">메일 받기 서버 수정</string>
+    <string name="account_settings_outgoing_label">보내기 서버</string>
+    <string name="account_settings_outgoing_summary">메일 보내기서버(SMTP) 수정</string>
+    <string name="account_settings_add_account_label">Add another account</string>
+    <string name="account_settings_description_label">계정 이름</string>
+    <string name="account_settings_name_label">당신의 이름</string>
+    <string name="notifications_title">알림</string>
+    <string name="account_settings_ring_summary">메일 도착시 벨울림</string>
+    <string name="account_settings_vibrate_enable">진동</string>
+    <string name="account_settings_vibrate_summary">메일 도착시 진동</string>
+    <string name="account_settings_vibrate_pattern_label">진동 패턴</string>
+    <string name="account_settings_vibrate_pattern_default">기본</string>
+    <string name="account_settings_vibrate_pattern_1">패턴 1</string>
+    <string name="account_settings_vibrate_pattern_2">패턴 2</string>
+    <string name="account_settings_vibrate_pattern_3">패턴 3</string>
+    <string name="account_settings_vibrate_pattern_4">패턴 4</string>
+    <string name="account_settings_vibrate_pattern_5">패턴 5</string>
+    <string name="account_settings_vibrate_times">진동 반복</string>
+    <string name="account_settings_ringtone">새로운 메일 벨울림</string>
+    <string name="account_settings_led_label">LED 깜빡임</string>
+    <string name="account_settings_led_summary">메일 도착시 LED를 깜빡입니다.</string>
+
+
+    <string name="account_settings_servers">서버 설정</string>
+
+    <string name="account_settings_composition_title">메시지 작성 옵션</string>
+    <string name="account_settings_composition_label">메시지 작성 기본값</string>
+    <string name="account_settings_composition_summary"> 기본 발신자, 숨은참조, 서명을 설정</string>
+
+    <string name="account_settings_identities_label">내 정보 관리</string>
+    <string name="account_settings_identities_summary">Set up alternate \'From\' addresses and signatures</string>
+
+    <string name="manage_identities_title">신원(Identities) 관리</string>
+
+    <string name="manage_identities_context_menu_title">신원(Identity) 관리</string>
+
+    <string name="edit_identity_title">신원(Identity) 수정</string>
+    <string name="new_identity_action">새로운 신원(Identity)</string>
+
+    <string name="account_settings_always_bcc_label">모든 메시지를 비밀첨부 보냄</string>
+    <string name="account_settings_always_bcc_summary">이 주소로 보내는 모든 메시지의 복사본을 전달합니다</string>
+
+    <string name="manage_identities_edit_action">수정</string>
+    <string name="manage_identities_move_up_action">위로 이동</string>
+    <string name="manage_identities_move_down_action">아래로 이동</string>
+    <string name="manage_identities_move_top_action">맨위로 이동 / 기본값으로 함</string>
+    <string name="manage_identities_remove_action">제거</string>
+
+    <string name="edit_identity_description_label">이 항목(Identity) 설명</string>
+    <string name="edit_identity_description_hint">(Optional)</string>
+    <string name="edit_identity_name_label">이름</string>
+    <string name="edit_identity_name_hint">(옵션)</string>
+    <string name="edit_identity_email_label">이메일 주소</string>
+    <string name="edit_identity_email_hint">(필수)</string>
+    <string name="edit_identity_reply_to_label">회신(reply-to) 주소</string>
+    <string name="edit_identity_reply_to_hint">(옵션)</string>
+    <string name="edit_identity_signature_label">서명</string>
+    <string name="edit_identity_signature_hint">(옵션)</string>
+
+    <string name="account_settings_signature_use_label">서명 사용</string>
+    <string name="account_settings_signature_label">서명</string>
+    <string name="account_settings_signature_summary">모든 보내는 메시지에 서명을 사용합니다</string>
+
+    <string name="default_signature">-- \nSent from my Android phone with K-9 Mail. Please excuse my brevity.</string>
+    <string name="default_identity_description">초기 발신자</string>
+    <string name="choose_identity">발신자 선택</string>
+    <string name="choose_identity_title">발신자 선택</string>
+    <string name="choose_account_title">계정을 선택하시오</string>
+    <string name="send_as">다른 계정으로 보내기</string>
+
+
+    <string name="no_identities">신원 설정 가기 -&gt; 새로운 신원(Identity) 생성을 위한 신원(Identity) 관리</string>
+    <string name="no_removable_identity">신원(Identity)를 제거할 수 없습니다.</string>
+    <string name="identity_has_no_email">이메일 주소없이 신원(Identity)을 사용할 수 없습니다</string>
+    <string name="identity_will_not_be_saved">신원(Identity) 선택과 서명 변경은 임시 저장에서 제외됩니다</string>
+
+    <string name="sort_earliest_first">오래된 메시지를 순서</string>
+    <string name="sort_latest_first">최근 메시지 순서</string>
+    <string name="sort_sender_alpha">알파벳 순서</string>
+    <string name="sort_sender_re_alpha">알파벳 순서의 역순</string>
+    <string name="sort_subject_alpha">제목의 알파벳 순서</string>
+    <string name="sort_subject_re_alpha">제목의 알파벳 순서의 역순</string>
+    <string name="sort_flagged_first">즐겨찾기(stared) 메시지를 첫번째로</string>
+    <string name="sort_flagged_last">즐겨찾기아닌(unstarted) 메시지를 첫번째로</string>
+    <string name="sort_unread_first">읽지않은 메시지를 첫번째로</string>
+    <string name="sort_unread_last">읽은 메시지를 첫번째로</string>
+    <string name="sort_attach_first">첨부파일이 있는 메시지를 첫번째로</string>
+    <string name="sort_unattached_first">첨부파일이 있는 메시지를 첫번째로</string>
+
+    <string name="sort_by">정렬</string>
+    <string name="sort_by_date">날짜</string>
+    <string name="sort_by_sender">보낸이</string>
+    <string name="sort_by_subject">제목</string>
+    <string name="sort_by_flag">즐겨찾기</string>
+    <string name="sort_by_unread">읽음/읽지않음</string>
+    <string name="sort_by_attach">첨부</string>
+    <string name="message_web_view_error">%s</string>
+
+    <string name="account_delete_dlg_title">계정 삭제</string>
+    <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" 계정이 K-9에서 삭제됩니다.</string>
+
+    <string name="account_recreate_dlg_title">계정 재생성</string>
+    <string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 데이타가 K-9에서 삭제됩니다. 하지만 계정 설정은 보존됩니다.</string>
+
+    <string name="account_clear_dlg_title">계정 비우기</string>
+    <string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 메일이 K-9에서 삭제될것입니다. 하지만 계정 설정은 보존됩니다.</string>
+
+	<string name="provider_note_live">\"Plus\" 계정만이 이 프로그램을 POP 접근 하도록 허락합니다. 
+	올바른 이메일 주소와 비밀번호로 로그인 실패할 경우 \"Plus\" 계정을 위해 유료전환 해야 할 것입니다. 
+	웹브라우저를 통해 접근을 얻도록 하십시오</string>	
+		
+    <string name="provider_note_yahoojp">POP3를 이용하기위해서는 야휴 메일 설정페이지에서 POP3 이용을 설정하여야합니다.</string>
+   
+    <string name="provider_note_naver">IMAP/POP3를 이용하기위해서는 네이버 메일 설정페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
+    <string name="provider_note_hanmail">IMAP/POP3을 이용하기위해서는 한메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
+    <string name="provider_note_paran">IMAP/POP3을 이용하기위해서는 파란 메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
+    <string name="provider_note_nate">IMAP/POP3을 이용하기위해서는 네이트 메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
+    
+    <string name="account_setup_failed_dlg_invalid_certificate_title">잘못된 인증정보</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
+
+    <string name="message_help_key">Del (or D) - 삭제\u000AR -
+    회신\u000AA - 전체 회신\u000AF - 전달\u000AJ or P - Previous
+    메시지\u000AK, N - 다음 메시지\u000AM - 이동\u000AY - 복사\u000AZ - Zoom Out\u000AShift-Z -
+    Zoom In\u000aG - Star</string>
+    <string name="message_list_help_key">Del (or D) - 삭제\u000AR -
+    회신\u000AA - 전체 회신\u000AC - 작성\u000AF - 전달\u000aM -
+    이동\u000AY - 복사\u000AG - Star\u000AO - Sort type\u000AI - 정렬 순서\u000AQ
+    - 폴더로 돌아가기\u000AS - 선택/선택해제</string>
+
+    <string name="folder_list_help_key">
+    1 - 첫 번째 클래스 폴더만 보기\u000A
+    2 - 첫 번째, 두 번째 클레스(Class)를 제외하고 모두 보기\u000A
+    3 - 두 번째 클레스(Class)를 제외하고 모두 보기\u000A
+    4 - 모든 폴더 보기\u000A
+    Q - 계정 변경\u000A
+    S - 계정 설정 변경</string>
+
+    <string name="folder_list_display_mode_label">폴더</string>
+    <string name="folder_list_display_mode_all">모든 폴더 표시</string>
+    <string name="folder_list_display_mode_first_class">Display only 1st Class folders</string>
+    <string name="folder_list_display_mode_first_and_second_class">Display 1st and 2nd Class folders</string>
+    <string name="folder_list_display_mode_not_second_class">Display all except 2nd Class folders</string>
+
+
+
+    <string name="account_settings_signature__location_label">서명 위치</string>
+    <string name="account_settings_signature__location_before_quoted_text">본문 앞에</string>
+    <string name="account_settings_signature__location_after_quoted_text">본문 뒤에</string>
+    <string name="setting_theme_dark">어두운</string>
+    <string name="setting_theme_light">밝은</string>
+    <string name="display_preferences">화면</string>
+    <string name="global_preferences">Global</string>
+    <string name="debug_preferences">디버깅</string>
+    <string name="privacy_preferences">개인정보</string>
+    <string name="network_preferences">네트워크</string>
+    <string name="interaction_preferences">상호 작용(Interaction)</string>
+    <string name="accountlist_preferences">계정 항목</string>
+    <string name="messagelist_preferences">메시지 리스트</string>
+    <string name="messageview_preferences">메시지</string>
+    <string name="settings_theme_label">테마</string>
+    <string name="settings_language_label">언어</string>
+
+    <string name="settings_messageview_mobile_layout_label">Single-column layout</string>
+    <string name="settings_messageview_mobile_layout_summary">작은 스크린에서 HTML 메시지를 다시만듬(reformat)</string>
+    <string name="settings_messageview_zoom_controls_label">시스템 줌 컨트롤</string>
+    <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
+
+
+
+    <string name="setting_language_system">시스템 기본값</string>
+
+    <string name="background_ops_label">벡그라운드 동기화</string>
+    <string name="background_ops_never">하지않음</string>
+    <string name="background_ops_always">항상</string>
+    <string name="background_ops_enabled">\'백그라운드 데이타\'가 선택된 경우</string>
+    <string name="background_ops_auto_sync">\'백그라운드 데이타\'와 \'Auto-sync\'가 선택된 경우</string>
+
+    <string name="no_message_seletected_toast">선택된 메시지가 없습니다.</string>
+
+    <string name="date_format_label">날짜 형식</string>
+    <!--
+      The values of the date_format_* strings MUST be valid date format strings.
+      See Android SDK documentation for the class SimpleDateFormat.
+    -->
+    <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_iso8601">yyyy-MM-dd</string>
+
+    <string name="batch_ops">선택항목 일괄처리</string>
+    <string name="batch_delete_op">삭제</string>
+    <string name="batch_mark_read_op">읽음으로 표시</string>
+    <string name="batch_mark_unread_op">읽지 않음으로 표시</string>
+    <string name="batch_flag_op">즐겨찾기 추기</string>
+    <string name="batch_unflag_op">즐겨찾기 해제</string>
+    <string name="batch_archive_op">보관(Archive)으로 이동</string>
+    <string name="batch_spam_op">스팸으로 이동</string>
+    <string name="batch_move_op">이동(Move)</string>
+    <string name="batch_copy_op">복사</string>
+    <string name="batch_flag_mode">즐겨찾기(Star) 모드</string>
+    <string name="batch_select_mode">선택(Select) 모드</string>
+    <string name="batch_plain_mode">일반(Plain)모드</string>
+    <string name="batch_select_all">모두 선택</string>
+    <string name="batch_deselect_all">선택 취소</string>
+
+    <string name="account_setup_push_limit_label">Push 체크할 최대 폴더 수</string>
+    <string name="account_setup_push_limit_10">10개 폴더</string>
+    <string name="account_setup_push_limit_25">25개 폴더</string>
+    <string name="account_setup_push_limit_50">50개 폴더</string>
+    <string name="account_setup_push_limit_100">100개 폴더</string>
+    <string name="account_setup_push_limit_250">250개 폴더</string>
+    <string name="account_setup_push_limit_500">500개 폴더</string>
+    <string name="account_setup_push_limit_1000">1000개 폴더</string>
+
+    <string name="animations_title">Animation</string>
+    <string name="animations_summary">Use gaudy visual effects</string>
+    <string name="gestures_title">제스쳐</string>
+    <string name="gestures_summary">제스쳐를 이용합니다</string>
+
+    <string name="compact_layouts_title">레이아웃 최적화(Compact)</string>
+    <string name="compact_layouts_summary">각 페이지에 더 많은 내용을 보여주기위해 레이아웃을 조절</string>
+
+    <string name="volume_navigation_title">볼륨키 네비게이션</string>
+    <string name="volume_navigation_summary">볼륨키를 이용하여 메시지 목록의 각 항목을 넘김</string>
+    <string name="volume_navigation_message">메시지 뷰</string>
+    <string name="volume_navigation_list">다양한 리스트 뷰</string>
+
+    <string name="manage_back_title"> \"뒤로\" 버튼 관리</string>
+    <string name="manage_back_summary">\"뒤로\" 버튼이 항상 위로</string>
+
+    <string name="start_integrated_inbox_title">통합 메일함으로 시작</string>
+    <string name="start_integrated_inbox_summary">통합 메일함을 시작시 보여줍니다</string>
+
+    <string name="measure_accounts_title">계정 용량을 보여줍니다</string>
+    <string name="measure_accounts_summary">빠른 처리를 위해 비활성화</string>
+
+    <string name="count_search_title">검색 결과 카운트</string>
+    <string name="count_search_summary">빠른 처리를 위해 비활성화</string>
+
+    <string name="hide_special_accounts_title">특정 계정 숨기기</string>
+    <string name="hide_special_accounts_summary">통합 이메일함과 모든 편지함 숨기기</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"> - 즐겨찾기 메일수</string>
+    <string name="unread_modifier"> - 읽지않은 메일수</string>
+
+    <string name="search_all_messages_title">모든 편지</string>
+    <string name="search_all_messages_detail">검색가능한 모든 편지</string>
+
+    <string name="integrated_inbox_title">통합 이메일함</string>
+    <string name="integrated_inbox_detail">통합된 폴더의 모든 이메일</string>
+
+    <string name="tap_hint">Tap envelope or star for unread or starred messages</string>
+
+    <string name="folder_settings_include_in_integrated_inbox_label">통합</string>
+    <string name="folder_settings_include_in_integrated_inbox_summary">모든 메시지는 통합 이메일함에 보여집니다</string>
+
+    <string name="account_settings_searchable_label">찾을 폴더</string>
+    <string name="account_settings_searchable_all">모두</string>
+    <string name="account_settings_searchable_displayable">보여지는 폴더</string>
+    <string name="account_settings_searchable_none">없음</string>
+
+    <string name="remote_control_label">K-9 메일 리모콘</string>
+    <string name="remote_control_desc">이 어플리케이션이 K-9 메일을 제어하고 설정하도록 함.</string>
+
+    <string name="font_size_settings_title">글꼴 크기</string>
+    <string name="font_size_settings_description">글꼴 크기 수정</string>
+
+    <string name="font_size_account_list">계정 목록</string>
+    <string name="font_size_account_name">계정 이름</string>
+    <string name="font_size_account_description">계정 정보</string>
+
+    <string name="font_size_folder_list">폴더 목록</string>
+    <string name="font_size_folder_name">폴더 이름</string>
+    <string name="font_size_folder_status">폴더 순위(status)</string>
+
+    <string name="font_size_message_list">메시지 목록</string>
+    <string name="font_size_message_list_subject">제목</string>
+    <string name="font_size_message_list_sender">보낸이</string>
+    <string name="font_size_message_list_date">날짜</string>
+    <string name="font_size_message_list_preview">미리보기</string>
+
+    <string name="font_size_message_view">메시지</string>
+    <string name="font_size_message_view_sender">보낸이</string>
+    <string name="font_size_message_view_to">받는이</string>
+    <string name="font_size_message_view_cc">참조</string>
+    <string name="font_size_message_view_additional_headers">추가 헤더정보</string>
+    <string name="font_size_message_view_subject">제목</string>
+    <string name="font_size_message_view_time">시간</string>
+    <string name="font_size_message_view_date">날짜</string>
+    <string name="font_size_message_view_content">내용</string>
+
+    <string name="font_size_tiniest">가장 작음</string>
+    <string name="font_size_tiny">매우 작음</string>
+    <string name="font_size_smaller">더 작게</string>
+    <string name="font_size_small">작게</string>
+    <string name="font_size_medium">중간</string>
+    <string name="font_size_large">크게</string>
+    <string name="font_size_larger">더 크게</string>
+
+    <string name="font_size_webview_smaller">가장 작음</string>
+    <string name="font_size_webview_small">더 작게</string>
+    <string name="font_size_webview_normal">보통</string>
+    <string name="font_size_webview_large">더 크게</string>
+    <string name="font_size_webview_larger">가장 크게</string>
+
+    <!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
+    <string name="message_compose_buggy_gallery">\"설정\" 확인 -&gt; \"갤러리 버그 회피\" 갤러리 3D버그를 피해 이미지 혹은 비디오를 사용하기위함.</string>
+
+    <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
+    <string name="message_compose_use_workaround">\"첨부 추가 (이미지)\" 혹은 \"첨부 추가 (비디오)\"를 Gallery 3D를 이용해서 이미지나 비디오를 보낼수 있습니다.</string>
+
+    <string name="miscellaneous_preferences">기타 설정</string>
+    <string name="misc_preferences_attachment_title">갤러리 버그 회피</string>
+    <string name="misc_preferences_attachment_description">이미지/비디오 첨부를 위한 버튼을 보여줍니다.(갤러리의 3D 버그를 회피하기위함)</string>
+
+    <!-- APG related -->
+    <string name="error_activity_not_found">이 작동에 대해 적절한 어플리케이션을 찾을 수 없습니다.</string>
+    <string name="error_apg_version_not_supported">설치된 APG 버전을 지원하지 않습니다.</string>
+    <string name="btn_crypto_sign">Sign</string>
+    <string name="btn_encrypt">암호화</string>
+    <string name="btn_decrypt">복호화</string>
+    <string name="btn_verify">인증(Verify)</string>
+    <string name="unknown_crypto_signature_user_id">&lt;알수없음&gt;</string>
+    <string name="key_id">id: %s</string>
+    <string name="insufficient_apg_permissions">K-9 는 APG를 완벽하게 접근할 권한이 없습니다. K-9 재설치를 통해 고쳐질 수 있습니다.</string>
+    <string name="pgp_mime_unsupported">PGP/MIME 메시지는 아직 지원하지 않습니다.</string>
+    <string name="attachment_encryption_unsupported">경고: 첨부파일이 아직 암호화 안 되었습니다</string>
+    <string name="send_aborted">보내기 실패.</string>
+
+    <string name="save_or_discard_draft_message_dlg_title">임시보관함에 저장하시겠습니까?</string>
+    <string name="save_or_discard_draft_message_instructions_fmt">메시지를 저장하거나 버리하시겠습니까?</string>
+
+    <string name="charset_not_found">이 메시지를 보여드릴수 없습니다. charset \"<xliff:g id="charset">%s</xliff:g>\" 을 찾을 수 없습니다.</string>
+
+    <string name="select_text_now">복사할 텍스트 선택.</string>
+
+    <string name="dialog_confirm_delete_title">삭제 확인</string>
+    <string name="dialog_confirm_delete_message">이 메시지를 삭제하시겠습니까?</string>
+    <string name="dialog_confirm_delete_confirm_button">삭제함</string>
+    <string name="dialog_confirm_delete_cancel_button">삭제하지 않음</string>
+
+    <string name="dialog_confirm_spam_title">스팸폴더로 이동 확인</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</item>
+        <item quantity="other">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</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>
+    <string name="dialog_confirm_spam_confirm_button">예</string>
+    <string name="dialog_confirm_spam_cancel_button">아니오</string>
+
+    <string name="dialog_attachment_progress_title">첨부파일 다운로드중</string>
+
+    <string name="debug_logging_enabled">디버그 로깅정보를 바탕으로 안드로이드 디버그 로깅 시스템 사용</string>
+
+    <string name="messagelist_sent_to_me_sigil">»</string>
+    <string name="messagelist_sent_cc_me_sigil">›</string>
+    <string name="error_unable_to_connect">연결실패</string>
+
+    <string name="account_unavailable">\"<xliff:g id="account">%s</xliff:g>\" 계정을 이용할 수 없습니다.; 저장장치를 확인하십시오.</string>
+
+	<string name="settings_attachment_default_path">첨부파일 저장위치</string>
+	<string name="attachment_save_title">첨부파일 저장</string>
+	<string name="attachment_save_desc">파일 브라우져를 찾을 수 없습니다. 첨부파일을 저장할 경로를 입력하시오</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6820477c0..ab70814a8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3,21 +3,19 @@
     <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>-->
-    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</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_authors_fmt">Auteurs: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisie Informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_libraries">De volgende externe bibliotheken worden gebruikt: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
-    <string name="read_attachment_label">Lees Email bijlage</string>
-    <string name="read_attachment_desc">Sta deze applicatie toe de bijlage van emails te lezen.</string>
-    <string name="read_messages_label">Lees Emails</string>
-    <string name="read_messages_desc">Sta deze aplicatie toe je Emails te lezen.</string>
-    <string name="delete_messages_label">Verwijder Emails</string>
-    <string name="delete_messages_desc">Sta deze applicatie toe om je Emails te verwijderen.</string>
+    <string name="read_attachment_label">Lees bijlage</string>
+    <string name="read_attachment_desc">Sta deze applicatie toe om bijlagen van e-mails te lezen.</string>
+    <string name="read_messages_label">Lees e-mails</string>
+    <string name="read_messages_desc">Sta deze aplicatie toe om je e-mails te lezen.</string>
+    <string name="delete_messages_label">Verwijder e-mails</string>
+    <string name="delete_messages_desc">Sta deze applicatie toe om je e-mails te verwijderen.</string>
 
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Accounts</string>
@@ -29,7 +27,7 @@
 
     <string name="compose_title">Ontwerp</string>
     <string name="debug_title">Fout opsporen</string>
-    <string name="choose_folder_title">Kies map</string>
+    <string name="choose_folder_title">Kies een map</string>
     <string name="choose_color_title">Kies een kleur</string>
 
     <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
@@ -42,15 +40,15 @@
     <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(Volgende poll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
+    <string name="status_syncing_off">\u0020(Synchroniseren uitgeschakeld)</string>
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Volgende</string> <!-- Used as part of a multi-step process -->
-    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">Vorige</string> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
-    <string name="cancel_action">Annuleer</string>
+    <string name="cancel_action">Annuleren</string>
     <string name="send_action">Verzenden</string>
-    <!-- NEW: <string name="send_again_action">Send Again</string>-->
+    <string name="send_again_action">Opnieuw Verzenden</string>
     <string name="select_action">Selecteren</string>
     <string name="deselect_action">Annuleer selectie</string>
     <string name="reply_action">Antwoorden</string>
@@ -70,13 +68,13 @@
     <string name="refresh_action">Vernieuwen</string>
     <string name="check_mail_action">Controleer mail</string>
     <string name="send_messages_action">Verstuur bericht</string>
-    <string name="list_folders_action">Mappen lijst</string>
+    <string name="list_folders_action">Mappenlijst</string>
     <string name="refresh_folders_action">Vernieuw mappen</string>
     <string name="mark_all_as_read_action">Markeer alle berichten als gelezen</string>
     <string name="add_account_action">Voeg account toe</string>
     <string name="compose_action">Nieuw bericht</string>
     <string name="search_action">Zoeken</string>
-    <string name="search_results">Zoek resultaten</string>
+    <string name="search_results">Zoekresultaten</string>
     <string name="preferences_action">Instellingen</string>
     <string name="open_action">Open</string>
     <string name="account_settings_action">Account instellingen</string>
@@ -96,7 +94,7 @@
     <string name="send_alternate_chooser_title">Kies afzender</string>
 
     <string name="mark_all_as_read_dlg_title">Markeer alle berichten als gelezen</string>
-    <string name="mark_all_as_read_dlg_instructions_fmt">Markeer alle berichten in \'<xliff:g id="folder">%s</xliff:g>\' als gelezen?  (inclusief berichten in de map welke niet zichtbaar zijn in K-9)</string>
+    <string name="mark_all_as_read_dlg_instructions_fmt">Markeer alle berichten in \'<xliff:g id="folder">%s</xliff:g>\' als gelezen?  (inclusief berichten in de map die niet zichtbaar zijn in K-9)</string>
 
     <string name="flag_action">Voeg ster toe</string>
     <string name="unflag_action">Verwijder ster</string>
@@ -117,7 +115,7 @@
     <string name="dump_settings_action">Gooi instellingen weg</string>
     <string name="empty_trash_action">Prullenbak legen</string>
     <string name="expunge_action">Wissen</string>
-    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
+    <string name="clear_local_folder_action">Lokale berichten wissen</string>
     <string name="set_sort_action">Kies sortering</string>
     <string name="reverse_sort_action">Omgekeerd sorteren</string>
     <string name="about_action">Over</string>
@@ -127,20 +125,19 @@
     <string name="folder_context_menu_title">Map opties</string>
 
     <string name="general_no_subject">(Geen onderwerp)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Geen datum</string>
     <string name="general_no_sender">Geen afzender</string>
     <string name="status_loading">Polling</string>
     <string name="status_loading_folder">(Poll <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
-    <string name="status_loading_more">Laden berichten\u2026</string>
-    <string name="status_network_error">Verbindings fout</string>
+    <string name="status_loading_more">Berichten laden\u2026</string>
+    <string name="status_network_error">Netwerkfout</string>
     <string name="status_invalid_id_error">Bericht niet gevonden</string>
     <string name="status_error">Fout</string> <!-- Used in Outbox when a message has failed to send -->
     <string name="status_sending">Bezig met verzenden</string> <!-- Used in Outbox when a message is currently sending -->
 
     <string name="status_loading_more_failed">Opnieuw meer berichten laden</string>
 
-    <string name="load_more_messages_fmt">Meer
-    dan <xliff:g id="messages_to_load">%d</xliff:g> laden</string>
+    <string name="load_more_messages_fmt">Volgende <xliff:g id="messages_to_load">%d</xliff:g> berichten</string>
 
     <string name="abbrev_gigabytes">GB</string>
     <string name="abbrev_megabytes">MB</string>
@@ -154,9 +151,9 @@
     <xliff:g id="newSize">%s</xliff:g>
     </string>
 
-    <string name="compacting_account">Verdichten account \"<xliff:g id="account">%s</xliff:g>\"</string>
-    <string name="clearing_account">Wissen account \"<xliff:g id="account">%s</xliff:g>\"</string>
-    <string name="recreating_account">Opnieuw instellen account \"<xliff:g id="account">%s</xliff:g>\"</string>
+    <string name="compacting_account">Account \"<xliff:g id="account">%s</xliff:g>\" comprimeren</string>
+    <string name="clearing_account">Account \"<xliff:g id="account">%s</xliff:g>\" wissen</string>
+    <string name="recreating_account">Account \"<xliff:g id="account">%s</xliff:g>\" opnieuw instellen</string>
 
     <string name="notification_new_title">Nieuwe mail</string>
     <string name="notification_new_scrolling">Nieuwe mail van <xliff:g id="sender">%s</xliff:g></string>
@@ -198,7 +195,7 @@
     De <xliff:g id="errorFolder">%s</xliff:g> map kan fout berichten bevatten over dit probleem.</string>
 
     <string name="alert_header">K-9 waarschuwing</string>
-    <string name="no_connection_alert">Synchroniseren en verzenden is opgeschort wegens gebrek aan netwerk.</string>
+    <string name="no_connection_alert">Synchroniseren en verzenden is gestopt omdat er geen verbinding is.</string>
 
     <string name="end_of_folder">Geen berichten meer</string>
 
@@ -209,7 +206,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
 \n * Push mail die IMAP IDLE gebruikt
 \n * Betere prestaties
 \n * Bericht heropenen
-\n * Email handtekeningen
+\n * E-mail handtekeningen
 \n * Bcc naar jezelf
 \n * Map abonnementen
 \n * Alle mappen synchronisatie
@@ -228,7 +225,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
 </string>
 
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
-    <string name="debug_enable_debug_logging_title">Fout loggen toestaan</string>
+    <string name="debug_enable_debug_logging_title">Fouten loggen toestaan</string>
     <string name="debug_enable_debug_logging_summary">Log extra diagnostische informatie</string>
     <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>
@@ -258,16 +255,17 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="message_compose_subject_hint">Onderwerp</string>
     <string name="message_compose_content_hint">Bericht tekst</string>
     <string name="message_compose_quote_header_separator">-------- Origineel bericht --------</string>
-    <string name="message_compose_quote_header_subject">Subject:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
-    <string name="message_compose_quote_header_from">From:</string>
-    <string name="message_compose_quote_header_to">To:</string>
+    <string name="message_compose_quote_header_subject">Onderwerp:</string>
+    <string name="message_compose_quote_header_send_date">Verzonden:</string>
+    <string name="message_compose_quote_header_from">Van:</string>
+    <string name="message_compose_quote_header_to">Aan:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
-    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
+    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> schreef:\n\n</string>
     <string name="message_compose_quoted_text_label">Ge-quote tekst</string>
     <string name="message_compose_error_no_recipients">Minimaal 1 ontvanger kiezen.</string>
-    <string name="message_compose_downloading_attachments_toast">Sommige bijlage zijn niet gedownload. Deze worden automatisch gedownload voor dat dit bericht is verzonden.</string>
-    <string name="message_compose_attachments_skipped_toast">Sommige bijlagen kunnen niet worden doorgestuurd, omdat ze niet zijn gedownload.</string>
+    <string name="error_contact_address_not_found">Geen e-mailadres gevonden.</string>
+    <string name="message_compose_downloading_attachments_toast">Sommige bijlagen zijn niet gedownload. Deze worden automatisch gedownload voor dat dit bericht is verzonden.</string>
+    <string name="message_compose_attachments_skipped_toast">Sommige bijlagen kunnen niet worden doorgestuurd omdat ze niet zijn gedownload.</string>
 
 
 
@@ -284,9 +282,9 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
     <string name="message_view_status_attachment_saved">Bijlage opgeslagen op SD-kaart als <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Opslaan bijlage op SD-kaart mislukt.</string>
-    <string name="message_view_show_pictures_instructions">Selecteer \"Laat afbeeldingen zien\" om de omsloten afbeeldingen te laten zien.</string>
+    <string name="message_view_show_pictures_instructions">Selecteer \"Laat afbeeldingen zien\" om de afbeeldingen te laten zien.</string>
     <string name="message_view_show_pictures_action">Laat afbeeldingen zien</string>
-    <string name="message_view_fetching_attachment_toast">ophalen bijlage.</string>
+    <string name="message_view_fetching_attachment_toast">bijlage ophalen.</string>
     <string name="message_view_no_viewer">Niet in staat viewer te vinden voor <xliff:g id="mimetype">%s</xliff:g>.</string>
 
 
@@ -295,7 +293,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <!-- 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">Niet alle headers zijn gedownload of opgeslagen. Selecteer \"Sla alle headers lokaal op\" in de account\'s inkomende server instellingen om dit in te schakelen voor de toekomst.</string>
     <string name="message_no_additional_headers_available">Alle headers zijn gedownload, maar er zijn geen extra headers aan te tonen.</string>
-    <string name="message_additional_headers_retrieval_failed">Het ophalen van extra headers uit de database of e-mail server is mislukt.</string>
+    <string name="message_additional_headers_retrieval_failed">Het ophalen van extra headers uit de database of e-mailserver is mislukt.</string>
 
     <string name="mailbox_select_dlg_title">Mappen</string>
     <string name="mailbox_select_dlg_new_mailbox_action">Nieuwe map</string>
@@ -323,11 +321,11 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="global_settings_checkbox_summary">Laat altijd multi-selecteer selectieboxen zien</string>
     <string name="global_settings_touchable_label">Berichten voorbeelden</string>
     <string name="global_settings_touchable_summary">Ruimere lijst items met bericht voorbeelden</string>
-    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
+    <string name="global_settings_preview_lines_label">Preview regels</string>
+    <string name="global_settings_show_correspondent_names_label">Toon naam bij bericht</string>
+    <string name="global_settings_show_correspondent_names_summary">Geef bij voorkeur naam van afzender/geadresseerde weer i.p.v. e-mailadres</string>
+    <string name="global_settings_show_contact_name_label">Toon naam uit contactenlijst</string>
+    <string name="global_settings_show_contact_name_summary">Geef de naam weer uit het adresboek</string>
     <string name="global_settings_registered_name_color_label">Kleuren contacten</string>
     <string name="global_settings_registered_name_color_default">Niet kleuren van namen in uw lijst met contactpersonen</string>
     <string name="global_settings_registered_name_color_changed">Kleuren van namen in uw lijst met contactpersonen</string>
@@ -342,23 +340,24 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="global_settings_confirm_action_archive">Archief</string>
     <string name="global_settings_confirm_action_delete">Verwijder (alleen berichten bekijken)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Markeer alles als gelezen</string>
     <string name="global_settings_confirm_action_send">Verzonden</string>
 
     <string name="global_settings_privacy_mode_title">Lock-screen meldingen</string>
     <string name="global_settings_privacy_mode_summary">Niet weergegeven onderwerp van het bericht in de notificatie bar als het systeem is vergrendeld</string>
 
 
-    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
-    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
-    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
-    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+    <string name="quiet_time">Stilteperiode</string>
+    <string name="quiet_time_description">Schakel beltoon, vibratie en leds uit gedurende de nacht</string>
+    <string name="quiet_time_starts">Stilteperiode start</string>
+    <string name="quiet_time_ends">Stilteperiode eindigt</string>
 
 
     <string name="account_setup_basics_title">Een nieuwe account instellen</string>
-    <string name="account_setup_basics_instructions">Toets het email adres in van deze account:</string>
+    <string name="account_setup_basics_instructions">Toets het e-mailadres in van deze account:</string>
     <string name="account_setup_basics_instructions2_fmt">(Je mag meer <xliff:g id="number_accounts">%d</xliff:g> accounts toevoegen.)</string>
-    <string name="account_setup_basics_email_hint">Email adres</string>
-    <string name="account_setup_basics_email_error_invalid_fmt"><xliff:g id="email">%s</xliff:g> is geen geldig email adres.</string>
+    <string name="account_setup_basics_email_hint">E-mailadres</string>
+    <string name="account_setup_basics_email_error_invalid_fmt"><xliff:g id="email">%s</xliff:g> is geen geldig e-mailadres.</string>
     <string name="account_setup_basics_email_error_duplicate_fmt"><xliff:g id="email">%s</xliff:g> is al toegevoegd.</string>
     <string name="account_setup_basics_password_hint">Wachtwoord</string>
     <string name="account_setup_basics_default_label">Verzend mail standaard vanaf deze account</string>
@@ -368,8 +367,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_check_settings_retr_info_msg">Ophalen account informatie\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Controleren van inkomende serverinstellingen\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Controleren van uitgaande serverinstellingen\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
-    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
+    <string name="account_setup_check_settings_authenticate">Authenticatie\u2026</string>
+    <string name="account_setup_check_settings_fetch">Accountinstellingen worden opgehaald\u2026</string>
     <string name="account_setup_check_settings_finishing_msg">Afronden\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Annuleren\u2026</string>
 
@@ -412,13 +411,13 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Anders</string>
 
-    <string name="account_setup_incoming_save_all_headers_title">Downloaden van email headers</string>
+    <string name="account_setup_incoming_save_all_headers_title">Downloaden van e-mailheaders</string>
     <string name="account_setup_incoming_save_all_headers_label">Sla alle headers lokaal op</string>
 
-    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
-    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+    <string name="local_storage_provider_external_label">Externe opslag (SD kaart)</string>
+    <string name="local_storage_provider_internal_label">Reguliere interne opslag</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s extra interne opslag</string>
+    <string name="local_storage_provider_label">Opslag locatie</string>
 
     <string name="account_setup_expunge_policy_label">Wissen berichten</string>
     <string name="account_setup_expunge_policy_immediately">Onmiddellijk na verwijderen of verplaatsen</string>
@@ -515,7 +514,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_options_mail_display_count_250">250 berichten</string>
     <string name="account_setup_options_mail_display_count_500">500 berichten</string>
     <string name="account_setup_options_mail_display_count_1000">1000 berichten</string>
-    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+    <string name="account_setup_options_mail_display_count_all">alle berichten</string>
 
 
     <string name="move_copy_cannot_copy_unsynced_message">Kan bericht niet kopiëren of verplaatsen omdat deze niet gesynchroniseerd is met de server</string>
@@ -527,14 +526,14 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_setup_failed_dlg_edit_details_action">Aanpassen details</string>
     <string name="account_setup_failed_dlg_continue_action">Doorgaan</string>
 
-    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
+    <string name="account_settings_push_advanced_title">Geavanceerd</string>
     <string name="account_settings_title_fmt">Algemene instellingen</string>
     <string name="account_settings_default">Standaard account</string>
     <string name="account_settings_default_label">Standaard account</string>
     <string name="account_settings_default_summary">Standaard mail verzenden vanaf deze account</string>
     <string name="account_settings_notify_label">Nieuwe mail notificatie</string>
     <string name="account_settings_notify_sync_label">Sync notificatie</string>
-    <string name="account_settings_email_label">Jou email adres</string>
+    <string name="account_settings_email_label">Je e-mailadres</string>
     <string name="account_settings_notify_summary">Notificatie in statusbalk wanneer nieuwe mail binnenkomt</string>
     <string name="account_settings_notify_sync_summary">Notificatie in statusbalk wanneer wordt gecontroleerd op nieuwe mail</string>
     <string name="account_settings_show_combined_label">Laat gecombineerde Inbox zien</string>
@@ -542,8 +541,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_notify_self_summary">Notificatie ook voor mail verzonden vanaf een identiteit</string>
     <string name="account_settings_notification_opens_unread_label">Notificatie opent ongelezen berichten</string>
     <string name="account_settings_notification_opens_unread_summary">Zoekt voor ongelezen berichten wanneer Notificatie is geopend</string>
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
+    <string name="account_settings_notification_unread_count_label">Toon aantal ongelezen</string>
+    <string name="account_settings_notification_unread_count_summary">Toon het aantal ongelezen berichten in de \'notification bar\'.</string>
 
     <string name="account_settings_hide_buttons_label">Scroll navigatie knoppen</string>
     <string name="account_settings_hide_buttons_never">Nooit</string>
@@ -564,16 +563,16 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_reply_after_quote_label">Antwoorden na quote</string>
     <string name="account_settings_reply_after_quote_summary">Wanneer u antwoord op berichten, zal het originele bericht boven uw antwoord staan.</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+    <string name="account_settings_message_format_label">Berichtopmaak</string>
+    <string name="account_settings_message_format_text">Platte Tekst (plaatjes en formattering worden verwijderd)</string>
+    <string name="account_settings_message_format_html">HTML (plaatjes en formattering blijven behouden)</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_quote_style_label">Quotestijl bij antwoorden</string>
+    <string name="account_settings_quote_style_prefix">Prefix (zoals Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Header (zoals Outlook, Yahoo!, Hotmail)</string>
 
-    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
-    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_general_title">Algemeen</string>
+    <string name="account_settings_display_prefs_title">Scherm</string>
     <string name="account_settings_sync">Synchroniseren van mappen</string>
     <string name="account_settings_folders">Mappen</string>
     <string name="account_settings_message_lists">Lijst berichten</string>
@@ -584,12 +583,12 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="account_settings_crypto_app_none">Geen</string>
     <string name="account_settings_crypto_app_not_available">niet beschikbaar</string>
     <string name="account_settings_crypto_auto_signature">Auto-ondertekenen</string>
-    <string name="account_settings_crypto_auto_signature_summary">Gebruik het account email adres om de digitale sleutel te raden.</string>
+    <string name="account_settings_crypto_auto_signature_summary">Gebruik het e-mailadres van je account om de digitale sleutel te raden.</string>
 
     <string name="account_settings_mail_check_frequency_label">Mappen poll controleer frequentie</string>
     <string name="account_settings_second_class_check_frequency_label">2e klasse controleer frequentie</string>
 
-    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+    <string name="account_settings_storage_title">Opslag</string>
 
 
     <string name="account_settings_color_label">Account kleur</string>
@@ -734,7 +733,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="edit_identity_description_hint">(Optioneel)</string>
     <string name="edit_identity_name_label">Jou naam</string>
     <string name="edit_identity_name_hint">(Optioneel)</string>
-    <string name="edit_identity_email_label">Email adres</string>
+    <string name="edit_identity_email_label">E-mailadres</string>
     <string name="edit_identity_email_hint">(Vereist)</string>
     <string name="edit_identity_reply_to_label">Reply-naar adres</string>
     <string name="edit_identity_reply_to_hint">(Optioneel)</string>
@@ -750,12 +749,12 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="choose_identity">Kies identiteit</string>
     <string name="choose_identity_title">Kies identiteit</string>
     <string name="choose_account_title">Kies account/identiteit</string>
-    <!-- NEW: <string name="send_as">Send as</string>-->
+    <string name="send_as">Verzenden als</string>
 
 
     <string name="no_identities">Ga naar Account Instellingen -&gt; Beheer identiteiten om identiteiten aan te maken</string>
     <string name="no_removable_identity">Je kan je eigen identiteit niet verwijderen</string>
-    <string name="identity_has_no_email">Je kan een identiteit niet gebruiken zonder email adres</string>
+    <string name="identity_has_no_email">Je kan een identiteit niet gebruiken zonder e-mailadres</string>
     <string name="identity_will_not_be_saved">Je identiteit en handtekening wijzigingen worden niet opgeslagen als concept</string>
 
     <string name="sort_earliest_first">Oudste berichten eerst</string>
@@ -792,7 +791,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="provider_note_live">Alleen sommige \"Plus\" accounts staan POP access
  toe om verbinding te krijgen met dit programma. Als het niet mogelijk is om in te loggen met de juiste gebruikersnaam en wachtwoord, heb je misschien geen betaalde \"Plus\" account.  Start de webbrowser om de toegang tot deze e-mailaccount te krijgen.</string>
 
-    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+    <string name="provider_note_yahoojp">Als je POP3 wilt gebruiken, moet je het geebruik van POP3 activeren op de Yahoo mail settings pagina.</string>
 
     <string name="account_setup_failed_dlg_invalid_certificate_title">Onbekend Certificaat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepteer Sleutel</string>
@@ -829,21 +828,21 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="setting_theme_dark">Donker</string>
     <string name="setting_theme_light">Licht</string>
     <string name="display_preferences">Algemene instellingen</string>
-    <!-- NEW: <string name="global_preferences">Global</string>-->
+    <string name="global_preferences">Globaal</string>
     <string name="debug_preferences">Verwijderen van fouten</string>
-    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
-    <!-- NEW: <string name="network_preferences">Network</string>-->
-    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
+    <string name="privacy_preferences">Privacy</string>
+    <string name="network_preferences">Netwerk</string>
+    <string name="interaction_preferences">Interactie</string>
     <string name="accountlist_preferences">Account Lijst</string>
     <string name="messagelist_preferences">Berichten Lijst</string>
     <string name="messageview_preferences">Berichten</string>
     <string name="settings_theme_label">Thema</string>
     <string name="settings_language_label">Taal</string>
 
-    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
-    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+    <string name="settings_messageview_mobile_layout_label">1-kolom layout</string>
+    <string name="settings_messageview_mobile_layout_summary">Herschik HTML berichten voor kleinere schermen</string>
+    <string name="settings_messageview_zoom_controls_label">Apparaat zoom</string>
+    <string name="settings_messageview_zoom_controls_summary">Gebruik zoom widgets of pinch-zoom als het apparaat dat ondersteunt</string>
 
 
 
@@ -897,8 +896,8 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="gestures_title">Gebaren</string>
     <string name="gestures_summary">Accepteer gebaren sturing</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_title">Compacte layout</string>
+    <string name="compact_layouts_summary">Pas layout aan zodat er meer op een pagina past</string>
 
     <string name="volume_navigation_title">Volume op/neer navigatie</string>
     <string name="volume_navigation_summary">Spring tussen items door gebruik van de volumeknoppen</string>
@@ -917,6 +916,9 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="count_search_title">Tel zoek resultaten</string>
     <string name="count_search_summary">Zet uit voor sneller beeldscherm</string>
 
+    <string name="hide_special_accounts_title">Verberg speciale accounts</string>
+    <string name="hide_special_accounts_summary">Verberg de gecombineerde inbox and alle berichtaccounts</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"> - Starred</string>
     <string name="unread_modifier"> - Ongelezen</string>
@@ -955,7 +957,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="font_size_message_list_subject">Bericht onderwerp</string>
     <string name="font_size_message_list_sender">bericht afzender</string>
     <string name="font_size_message_list_date">Bericht datum</string>
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+    <string name="font_size_message_list_preview">Preview</string>
 
     <string name="font_size_message_view">Beeld berichten</string>
     <string name="font_size_message_view_sender">bericht afzender</string>
@@ -1017,11 +1019,36 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
     <string name="dialog_confirm_delete_confirm_button">Verwijder</string>
     <string name="dialog_confirm_delete_cancel_button">Niet verwijderen</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">Bevestig verplaatsing naar spam map</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Wil je dit bericht echt verplaatsen naar de spam map?</item>
+        <item quantity="other">Wil je dit bericht echt verplaatsen naar de spam map?</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>
+    <string name="dialog_confirm_spam_confirm_button">Ja</string>
+    <string name="dialog_confirm_spam_cancel_button">Nee</string>
+
+    <string name="dialog_attachment_progress_title">Bijlage wordt opgehaald</string>
 
     <string name="debug_logging_enabled">Debug logging van Android logging systeem ingeschakeld</string>
 
-    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
-    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
-    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+    <string name="messagelist_sent_to_me_sigil">»</string> <!-- why is this language dependent? -->
+    <string name="messagelist_sent_cc_me_sigil">›</string>
+    <string name="error_unable_to_connect">Kan geen verbinding maken.</string>
+
+    <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is niet beschikbaar; controleer opslag</string>
+
+    <string name="settings_attachment_default_path">Sla bijlagen op naar...</string>
+    <string name="attachment_save_title">Sla bijlage op</string>
+    <string name="attachment_save_desc">Geen bestandsverkenner gevonden. Waar wil je deze bijlage opslaan?</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9a76e0739..fa847c92b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -8,6 +8,7 @@
 <!--  ## This is draft. Send all your notes or suggestions to address given above.      ## -->
 <!--  ##                                                                                ## -->
 <!--  ## Latest update: (YYYY-MM-DD): 2010.07.03                                        ## -->
+<!--  ## Modified by rabbbit, 2011.03.03												## -->
 <!--  ##                                                                                ## -->
 <!--  #################################################################################### -->
 
@@ -18,24 +19,22 @@
     <!-- 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>-->
     <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autorzy: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Historia zmian: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
     <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
     <string name="read_attachment_label">Odczyt załączników</string>
     <string name="read_attachment_desc">Zezwalaj tej aplikacji na czytanie załaczników z Twoich maili.</string>
-    <!-- NEW: <string name="read_messages_label">read Emails</string>-->
-    <!-- NEW: <string name="read_messages_desc">Allows this application to read your Emails.</string>-->
-    <!-- NEW: <string name="delete_messages_label">Delete Emails</string>-->
-    <!-- NEW: <string name="delete_messages_desc">Allows this application to delete your Emails.</string>-->
+    <string name="read_messages_label">Odczytaj maile</string>
+    <string name="read_messages_desc">Zezwalaj tej aplikacji na czytanie Twoich maili</string>
+    <string name="delete_messages_label">Usuń emaile</string>
+    <string name="delete_messages_desc">Zezwalaj tej aplikacji na usuwanie Twoich maili.</string>
 
     <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Konta</string>
     <string name="advanced">Zaawansowane</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
-    <!-- NEW: <string name="shortcuts_title">K-9 Accounts</string>-->
+    <string name="shortcuts_title">Konta K-9</string>
 
     <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
 
@@ -48,28 +47,28 @@
 
     <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
     <string name="status_loading_account_folder">\u0020(Pobieram <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_loading_account_folder_headers">\u0020(Fetching headers <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(Pobieranie nagłówków <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(Wysyłam <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_processing_account">\u0020(Przetw. <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(Sprawdzę o <xliff:g id="nexttime">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
+    <string name="status_syncing_off">\u0020(Synchronizacja wyłączona)</string>
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Dalej</string> <!-- Used as part of a multi-step process -->
-    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">Cofnij</string> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Anuluj</string>
     <string name="send_action">Wyślij</string>
-    <!-- NEW: <string name="send_again_action">Send Again</string>-->
+    <string name="send_again_action">Prześlij ponownie</string>
     <string name="select_action">Zaznacz</string>
     <string name="deselect_action">Odznacz</string>
     <string name="reply_action">Odpowiedz</string>
     <string name="reply_all_action">Odpowiedz wszystkim</string>
     <string name="delete_action">Usuń</string>
     <string name="archive_action">Archiwizuj</string>
-    <!-- NEW: <string name="spam_action">Spam</string>-->
+    <string name="spam_action">Spam</string>
     <string name="delete_all_action">Wyczyśc folder</string>
     <string name="forward_action">Prześlij dalej</string>
     <string name="move_action">Przenieś</string>
@@ -93,7 +92,7 @@
     <string name="open_action">Otwórz</string>
     <string name="account_settings_action">Ustawienia konta</string>
     <string name="folder_settings_action">Ustawienia folderu</string>
-    <!-- NEW: <string name="global_settings_action">Global settings</string>-->
+    <string name="global_settings_action">Ustawienia globalne</string>
     <string name="remove_account_action">Usuń konto</string>
     <string name="clear_pending_action">Anuluj oczekujące zadania (niebezpieczne!)</string>
 
@@ -104,7 +103,7 @@
     <string name="back_to_folder_list_action">◀</string>
     <string name="read_action">Otwórz</string>
     <string name="mark_as_read_action">Ozn. jako przeczytane</string>
-    <string name="send_alternate_action">Przślij dalej (alternatywne)</string>
+    <string name="send_alternate_action">Prześlij dalej (alternatywne)</string>
     <string name="send_alternate_chooser_title">Wybierz nadawcę</string>
 
     <string name="mark_all_as_read_dlg_title">Wszystkie jako przeczytane</string>
@@ -116,7 +115,7 @@
     <string name="copy_action">Skopiuj</string>
     <string name="show_full_header_action">Pokaż pełne nagłówki</string>
     <string name="hide_full_header_action">Ukryj pełne nagłówki</string>
-    <!-- NEW: <string name="select_text_action">Select text</string>-->
+    <string name="select_text_action">Wybierz text</string>
 
     <string name="mark_as_unread_action">Jako nieprzeczytane</string>
     <string name="move_to_action">Przenieś do</string>
@@ -129,8 +128,8 @@
     <string name="add_attachment_action_video">Add załącznik (Film)</string>
     <string name="dump_settings_action">Zapisz ustawienia</string>
     <string name="empty_trash_action">Opróżnij śmietnik</string>
-    <string name="expunge_action">Expunge</string> <!-- FIXME -->
-    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
+    <string name="expunge_action">Wyczyść</string> <!-- FIXME - probably-->
+    <string name="clear_local_folder_action">Wyczyść wiadomości lokalne</string>
     <string name="set_sort_action">Wybierz sortowanie</string>
     <string name="reverse_sort_action">Sortuj malejąco</string>
     <string name="about_action">O programie</string>
@@ -140,7 +139,7 @@
     <string name="folder_context_menu_title">Opcje folderu</string>
 
     <string name="general_no_subject">(Brak tematu)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Brak daty</string>
     <string name="general_no_sender">Brak nadawcy</string>
     <string name="status_loading">Poll <xliff:g id="progress">%s</xliff:g></string>
     <string name="status_loading_folder">(Poll <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -185,15 +184,15 @@
     <string name="special_mailbox_name_drafts">Drafts</string>
     <string name="special_mailbox_name_trash">Trash</string>
     <string name="special_mailbox_name_sent">Sent</string>
-    <!-- NEW: <string name="special_mailbox_name_archive">Archive</string>-->
-    <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
+    <string name="special_mailbox_name_archive">Archiwizuj</string>
+    <string name="special_mailbox_name_spam">Spam</string>
     <!-- Mailbox names displayed to user -->
 
-        <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string>
+    <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Szkice)</string>
     <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Śmietnik)</string>
     <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Wysłane)</string>
-    <!-- NEW: <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>-->
-    <!-- NEW: <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>-->
+    <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archiwum)</string>
+    <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
 
     <string name="send_failure_subject">Niektóre wiadomości nie zostały wysłane</string>
     <string name="send_failure_body_abbrev">Dalsze informacje znajdziesz w folderze <xliff:g id="errorFolder">%s</xliff:g>.</string>
@@ -269,13 +268,14 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_compose_content_hint">Treść wiadomości</string>
     <string name="message_compose_quote_header_separator">-------- Wiadomość oryginalna --------</string>
     <string name="message_compose_quote_header_subject">Temat:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">Wysłane:</string>
     <string name="message_compose_quote_header_from">Od:</string>
     <string name="message_compose_quote_header_to">Do:</string>
     <string name="message_compose_quote_header_cc">DW:</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> napisał:\n\n</string>
     <string name="message_compose_quoted_text_label">Cytowany tekst</string>
     <string name="message_compose_error_no_recipients">Musisz dodać co najmniej jednego odbiorcę.</string>
+    <string name="error_contact_address_not_found">Żaden adres email nie został znaleziony.</string>
     <string name="message_compose_downloading_attachments_toast">Niektóre załączniki nie zostały pobrane. Zostaną pobrane automatycznie przed wysłaniem tej wiadomości.</string>
     <string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą byc przesłane dalej ponieważ nie zostały wcześniej pobrane.</string>
 
@@ -288,9 +288,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_view_attachment_download_action">Zapisz</string>
     <string name="message_view_prev_action">\u25BC</string>
     <string name="message_view_next_action">\u25B2</string>
-    <!-- NEW: <string name="message_view_archive_action">Archive</string>-->
-    <!-- NEW: <string name="message_view_move_action">Move</string>-->
-    <!-- NEW: <string name="message_view_spam_action">Spam</string>-->
+    <string name="message_view_archive_action">Archiwizuj</string>
+    <string name="message_view_move_action">Przenieś</string>
+    <string name="message_view_spam_action">Spam</string>
     <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
     <string name="message_view_status_attachment_saved">Załącznik zapisano na karcie SD jako <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Zapisywanie załącznika na karcie SD nie powiodło się.</string>
@@ -300,7 +300,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
 
 
-    <!-- NEW: <string name="message_view_download_remainder">Download complete message</string>-->
+    <string name="message_view_download_remainder">Pobierz całą wiadomość</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>
@@ -333,35 +333,36 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="global_settings_checkbox_summary">Opcja zaznaczania dostępna zawsze w trybie wielokrotnego wyboru</string>
     <string name="global_settings_touchable_label">Widok Touch-friendly</string>
     <string name="global_settings_touchable_summary">Lista z podglądem treści wiadomości</string>
-    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
+    <string name="global_settings_preview_lines_label">Podglądaj linie</string>
+    <string name="global_settings_show_correspondent_names_label">Pokazuj nazwiska korespondentów</string>
+    <string name="global_settings_show_correspondent_names_summary">Pokazuj nazwiska korespondentów zamiast ich adresów email</string>
+    <string name="global_settings_show_contact_name_label">Pokazuj nazwiska kontaktów</string>
+    <string name="global_settings_show_contact_name_summary">Użyj nazwisk odbiorców z kontaktów kiedy to możliwe</string>
+    <string name="global_settings_registered_name_color_label">Koloruj kontakty</string>
+    <string name="global_settings_registered_name_color_default">Nie koloruj nazwisk na liście kontaktów</string>
+    <string name="global_settings_registered_name_color_changed">Koloruj nazwiska na liście kontaktów</string>
 
     <string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szer.</string>
     <string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania maili tekstowych</string>
     <string name="global_settings_messageview_return_to_list_label">Skasuj i wróć do listy</string>
     <string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danego maila</string>
 
-    <!-- NEW: <string name="global_settings_confirm_actions_title">Confirm actions</string>-->
-    <!-- NEW: <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_archive">Archive</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_delete">Delete (message view only)</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_spam">Spam</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_send">Send</string>-->
+    <string name="global_settings_confirm_actions_title">Potwierdź akcje</string>
+    <string name="global_settings_confirm_actions_summary">Pokaż okno dialogowe kiedy wykonujesz wybrane akcje</string>
+    <string name="global_settings_confirm_action_archive">Archiwizuj</string>
+    <string name="global_settings_confirm_action_delete">Usuń (tylko widok wiadomości)</string>
+    <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
+    <string name="global_settings_confirm_action_send">Wyślij</string>
 
-    <!-- NEW: <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>-->
-    <!-- NEW: <string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>-->
+    <string name="global_settings_privacy_mode_title">Powiadomienia ekranowe przy zablokowanym ekranie</string>
+    <string name="global_settings_privacy_mode_summary">Nie pokazuj tematu wiadomości w pasku powiadimień gdy ekran jest zablokowany</string>
 
 
-    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
-    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
-    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
-    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+    <string name="quiet_time">Okres ciszy</string>
+    <string name="quiet_time_description">Wyłącz dzwonienie, wibracje i mruganie w nocy</string>
+    <string name="quiet_time_starts">Początek okresu ciszy</string>
+    <string name="quiet_time_ends">Koniec okresu ciszy</string>
 
 
     <string name="account_setup_basics_title">Dodaj konto</string>
@@ -378,8 +379,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_check_settings_retr_info_msg">Pobieram informacje\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Sprawdzam ustawienia serwera\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Sprawdzam ustawienia serwera\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
-    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
+    <string name="account_setup_check_settings_authenticate">Autentykacja\u2026</string>
+    <string name="account_setup_check_settings_fetch">Pobieranie ustawień konta\u2026</string>
     <string name="account_setup_check_settings_finishing_msg">Kończę\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Przerywam\u2026</string>
 
@@ -425,10 +426,10 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_incoming_save_all_headers_title">Pobieranie nagłówków wiadomości</string>
     <string name="account_setup_incoming_save_all_headers_label">Zapisuj nagłówki lokalnie</string>
 
-    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
-    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+    <string name="local_storage_provider_external_label">Pamięć zewnętrzna (karta SD)</string>
+    <string name="local_storage_provider_internal_label">Zwykła pamięc wewnętrzna</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s dodatkowa pamięć wewnętrzna</string>
+    <string name="local_storage_provider_label">Lokalizacja pamięci</string>
 
     <string name="account_setup_expunge_policy_label">Usuwanie wiadomości</string>
     <string name="account_setup_expunge_policy_immediately">Od razu po skasowaniu lub przeniesieniu</string>
@@ -438,11 +439,11 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_incoming_imap_path_prefix_label">Prefiks ścieżki IMAP</string>
     <string name="account_setup_incoming_imap_path_prefix_hint">(K-9 użyje NAMESPACE, jeśli funkcjonalność jest dostępna)</string>
 
-    <string name="drafts_folder_label">Drafts folder name</string>
-    <string name="sent_folder_label">Sent folder name</string>
-    <string name="trash_folder_label">Trash folder name</string>
-    <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
-    <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
+    <string name="drafts_folder_label">Szkice</string>
+    <string name="sent_folder_label">Wysłane</string>
+    <string name="trash_folder_label">Kosz</string>
+    <string name="archive_folder_label">Archiwum</string>
+    <string name="spam_folder_label">Spam</string>
 
     <string name="account_setup_incoming_subscribed_folders_only_label">Pokaż tylko subskrybowane foldery</string>
     <string name="account_setup_auto_expand_folder">Zawsze rozwijaj folder</string>
@@ -525,7 +526,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_setup_options_mail_display_count_250">250 wiadomości</string>
     <string name="account_setup_options_mail_display_count_500">500 wiadomości</string>
     <string name="account_setup_options_mail_display_count_1000">1000 wiadomości</string>
-    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+    <string name="account_setup_options_mail_display_count_all">Wszystkie wiadomości</string>
 
 
     <string name="move_copy_cannot_copy_unsynced_message">Nie mogę skopiować ani przenieść wiadomości, która nie jest zsynchronizowana z serwerem</string>
@@ -552,54 +553,54 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_notify_self_summary">Powiadamiaj o mailach wysłanych przeze mnie</string>
     <string name="account_settings_notification_opens_unread_label">Notyfikacja otwiera nieprz. wiadomości</string> <!-- FIXME -->
     <string name="account_settings_notification_opens_unread_summary">Notifikacja wyszukuje nieprz. wiadomości</string> <!-- FIXME -->
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
+    <string name="account_settings_notification_unread_count_label">Pokaż liczbę nieprzeczytanych</string>
+    <string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień.</string>
 
     <string name="account_settings_hide_buttons_label">Przyciski nawigacyjne</string>
     <string name="account_settings_hide_buttons_never">Przyciski nie są nigdy przesuwalne</string>
     <string name="account_settings_hide_buttons_keyboard_avail">Przesuwalne, gdy jest klawiatura</string>
     <string name="account_settings_hide_buttons_always">Przyciski są zawsze przesuwalne</string>
 
-    <!-- NEW: <string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>-->
-    <!-- NEW: <string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>-->
-    <!-- NEW: <string name="account_settings_hide_move_buttons_label">Scroll refile buttons</string>-->
+    <string name="account_settings_enable_move_buttons_label">Użyj przycisków refile </string> <!-- FIXME -->
+    <string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string>
+    <string name="account_settings_hide_move_buttons_label">Przewijaj przyciski refile </string> <!-- FIXME -->
 
-    <!-- NEW: <string name="account_settings_show_pictures_label">Always show images</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_never">No</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_only_from_contacts">From contacts</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_always">From anyone</string>-->
+    <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
+    <string name="account_settings_show_pictures_never">Nie</string>
+    <string name="account_settings_show_pictures_only_from_contacts">Od kontaktów</string>
+    <string name="account_settings_show_pictures_always">Od każdego</string>
 
     <string name="account_settings_composition">Tworzenie wiadomości</string>
 
-    <!-- NEW: <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>-->
-    <!-- NEW: <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>-->
+    <string name="account_settings_reply_after_quote_label">Odpowiadaj po cytowanym tekście</string>
+    <string name="account_settings_reply_after_quote_summary">Podczas odpowiadania, wiadomość oryginalna pojawi się nad Twoją odpowiedzią.</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+    <string name="account_settings_message_format_label">Format wiadomości</string>
+    <string name="account_settings_message_format_text">Czysty tekst (bez obrazków i formatowania)</string>
+    <string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_quote_style_label">Styl cytowania podczas odpowiedzi</string>
+    <string name="account_settings_quote_style_prefix">Prefix (jak Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Nagłówek (jak Outlook, Yahoo!, Hotmail)</string>
 
-    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
-    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_general_title">Ustawienia ogólne</string>
+    <string name="account_settings_display_prefs_title">Wyświetlacz</string>
     <string name="account_settings_sync">Synchronizacja folderów</string>
     <string name="account_settings_folders">Foldery</string>
     <string name="account_settings_message_lists">Lista wiadomości</string>
     <string name="account_settings_message_view">Wyświetlanie wiadomości</string>
     <string name="account_settings_quote_prefix_label">Prefiks cytowania</string>
-    <!-- NEW: <string name="account_settings_crypto">Cryptography</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app">OpenPGP Provider</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app_none">None</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app_not_available">not available</string>-->
-    <!-- NEW: <string name="account_settings_crypto_auto_signature">Auto-sign</string>-->
-    <!-- NEW: <string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>-->
+    <string name="account_settings_crypto">Kryptografia</string>
+    <string name="account_settings_crypto_app">Dostawca OpenPGP</string>
+    <string name="account_settings_crypto_app_none">Bez</string>
+    <string name="account_settings_crypto_app_not_available">nie dostępny</string>
+    <string name="account_settings_crypto_auto_signature">Automatyczny podpis</string>
+    <string name="account_settings_crypto_auto_signature_summary">Użyj adresu email do zgadnięcia klucza podpisu.</string>
 
     <string name="account_settings_mail_check_frequency_label">Sprawdzanie konta</string>
     <string name="account_settings_second_class_check_frequency_label">Cykliczne sprawdzanie folderów klasy 2</string>
 
-    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+    <string name="account_settings_storage_title">Przechowanie</string>
 
 
     <string name="account_settings_color_label">Kolor konta</string>
@@ -610,20 +611,20 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
 
     <string name="account_settings_mail_display_count_label">Liczba wiadomości</string>
 
-    <!-- NEW: <string name="account_settings_autodownload_message_size_label">Fetch messages up to</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_1">1Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_2">2Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_4">4Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_8">8Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_16">16Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_32">32Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_64">64Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_128">128Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_256">256Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_512">512Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_1024">1Mb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_2048">2Mb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_any">any size (no limit)</string>-->
+    <string name="account_settings_autodownload_message_size_label">Pobierz wiadomośći aż do</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>
+    <string name="account_settings_autodownload_message_size_8">8Kb</string>
+    <string name="account_settings_autodownload_message_size_16">16Kb</string>
+    <string name="account_settings_autodownload_message_size_32">32Kb</string>
+    <string name="account_settings_autodownload_message_size_64">64Kb</string>
+    <string name="account_settings_autodownload_message_size_128">128Kb</string>
+    <string name="account_settings_autodownload_message_size_256">256Kb</string>
+    <string name="account_settings_autodownload_message_size_512">512Kb</string>
+    <string name="account_settings_autodownload_message_size_1024">1Mb</string>
+    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
+    <string name="account_settings_autodownload_message_size_any">dowolny rozmiar (bez limitu)</string>
 
     <string name="account_settings_message_age_label">Synchronizuj nowsze niż</string>
     <string name="account_settings_message_age_any">Wielki Wybuch</string>
@@ -666,8 +667,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_folder_target_mode_first_and_second_class">Foldery klasy 1 oraz 2</string>
     <string name="account_settings_folder_target_mode_not_second_class">Wszystkich poza klasą 2</string>
 
-    <!-- NEW: <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>-->
-    <!-- NEW: <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>-->
+    <string name="account_settings_sync_remote_deletetions_label">Synchronizacja usunięć na serwerze</string>
+    <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>
 
     <string name="folder_settings_title">Ustawienia folderu</string>
 
@@ -711,8 +712,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="account_settings_vibrate_pattern_5">Schemat 5</string>
     <string name="account_settings_vibrate_times">Liczba wibracji</string>
     <string name="account_settings_ringtone">Sygnał dzwiękowy</string>
-    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
-    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+    <string name="account_settings_led_label">Mrugaj diodą</string>
+    <string name="account_settings_led_summary">Zamrugaj diodą przy nowej wiadomości</string>
 
 
     <string name="account_settings_servers">Ustawienia serwera</string>
@@ -759,8 +760,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <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>
-    <!-- NEW: <string name="choose_account_title">Choose account/identity</string>-->
-    <!-- NEW: <string name="send_as">Send as</string>-->
+    <string name="choose_account_title">Wybierz konto/tożsamość</string>
+    <string name="send_as">Wyślij jako</string>
 
 
     <string name="no_identities">Przejdź do "Ustawienia Konta" -&gt; "Tożsamości" aby utworzyć tożsamość</string>
@@ -805,7 +806,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
         nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty
         korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string>
 
-    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</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="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
@@ -842,25 +843,25 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="setting_theme_dark">Ciemna</string>
     <string name="setting_theme_light">Jasna</string>
     <string name="display_preferences">Ustawienia globalne</string>
-    <!-- NEW: <string name="global_preferences">Global</string>-->
+    <string name="global_preferences">Globalne</string>
     <string name="debug_preferences">Debugging</string>
-    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
-    <!-- NEW: <string name="network_preferences">Network</string>-->
-    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
+    <string name="privacy_preferences">Prywatność</string>
+    <string name="network_preferences">Sieć</string>
+    <string name="interaction_preferences">Interakcja</string>
     <string name="accountlist_preferences">Lista kont</string>
     <string name="messagelist_preferences">Listy widomości</string>
     <string name="messageview_preferences">Wiadomości</string>
     <string name="settings_theme_label">Kolorystyka</string>
-    <!-- NEW: <string name="settings_language_label">Language</string>-->
+    <string name="settings_language_label">Język</string>
 
-    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
-    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+    <string name="settings_messageview_mobile_layout_label">Ułożenie z 1 kolumną</string>
+    <string name="settings_messageview_mobile_layout_summary">Przeformatuj wiadomości HTML dla mniejszych ekranów</string>
+    <string name="settings_messageview_zoom_controls_label">Systemowe powiększenie</string>
+    <string name="settings_messageview_zoom_controls_summary">Użyj zoom widgets i pinch-zoom jeśli Twoje urzędzenie je obsługuje</string>  <!-- FIXME -->
 
 
 
-    <!-- NEW: <string name="setting_language_system">System default</string>-->
+    <string name="setting_language_system">Domyślny systemowy</string>
 
     <string name="background_ops_label">Synchronizacja w tle</string>
     <string name="background_ops_never">Nigdy</string>
@@ -884,8 +885,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="batch_mark_unread_op">Ustaw jako nieprzeczytane</string>
     <string name="batch_flag_op">Dodaj gwiazdkę</string>
     <string name="batch_unflag_op">Usuń gwiazdkę</string>
-    <!-- NEW: <string name="batch_archive_op">Move selected to Archive</string>-->
-    <!-- NEW: <string name="batch_spam_op">Move selected to Spam</string>-->
+    <string name="batch_archive_op">Przenieś wybrane do archiwum</string>
+    <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>
@@ -908,13 +909,13 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="gestures_title">Gesty</string>
     <string name="gestures_summary">Pozwól na sterowanie gestami</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_title">Wygląd kopaktowy</string>
+    <string name="compact_layouts_summary">Dopaduj wygląd, aby wyświetlać więcej na każdej stronie</string>
 
-    <!-- NEW: <string name="volume_navigation_title">Volume key navigation</string>-->
-    <!-- NEW: <string name="volume_navigation_summary">Flip through items using the volume controls</string>-->
-    <!-- NEW: <string name="volume_navigation_message">Message view</string>-->
-    <!-- NEW: <string name="volume_navigation_list">Various list views</string>-->
+    <string name="volume_navigation_title">Nawigacja przyciskiem głośności</string>
+    <string name="volume_navigation_summary">Przeskakuj między rzeczami używając przycisków głośności</string>
+    <string name="volume_navigation_message">Wygląd wiadomości</string>
+    <string name="volume_navigation_list">Różne widoki list</string>
 
     <string name="manage_back_title">Przycisk \"Cofnij\"</string>
     <string name="manage_back_summary">Przycisk \"Cofnij\" zawsze cofa o jeden poziom wyżej</string>
@@ -928,6 +929,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="count_search_title">Zliczaj wyniki szukania</string>
     <string name="count_search_summary">Wyłącz by przyspieszyć wyświetlanie</string>
 
+    <string name="hide_special_accounts_title">Ukryj konta specjalne</string>
+    <string name="hide_special_accounts_summary">Ukryj zunifikowaną skrzynkę odbiorczą i wszystkie konta wiadomości</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"> - Z gwiazdka</string>
     <string name="unread_modifier"> - Nieprzeczytane</string>
@@ -966,7 +970,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="font_size_message_list_subject">Temat</string>
     <string name="font_size_message_list_sender">Nadawca</string>
     <string name="font_size_message_list_date">Data wiadomości</string>
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+    <string name="font_size_message_list_preview">Pogdląd</string>
 
     <string name="font_size_message_view">Wyświetlanie wiadomość</string>
     <string name="font_size_message_view_sender">Nadawca</string>
@@ -1003,36 +1007,61 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="misc_preferences_attachment_description">Wyświetla przyciski dodawania zdjęć oraz filmów jako załączników</string>
 
     <!-- APG related -->
-    <!-- NEW: <string name="error_activity_not_found">No suitable application for this action found.</string>-->
-    <!-- NEW: <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>-->
-    <!-- NEW: <string name="btn_crypto_sign">Sign</string>-->
-    <!-- NEW: <string name="btn_encrypt">Encrypt</string>-->
-    <!-- NEW: <string name="btn_decrypt">Decrypt</string>-->
-    <!-- NEW: <string name="btn_verify">Verify</string>-->
-    <!-- NEW: <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>-->
-    <!-- NEW: <string name="key_id">id: %s</string>-->
-    <!-- NEW: <string name="insufficient_apg_permissions">K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that.</string>-->
-    <!-- NEW: <string name="pgp_mime_unsupported">PGP/MIME messages are not supported yet.</string>-->
-    <!-- NEW: <string name="attachment_encryption_unsupported">Warning: attachments are NOT signed or encrypted yet.</string>-->
-    <!-- NEW: <string name="send_aborted">Send aborted.</string>-->
+    <string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string>
+    <string name="error_apg_version_not_supported">Zainstalowana wersja APG nie jest wspierana.</string>
+    <string name="btn_crypto_sign">Podpisz</string>
+    <string name="btn_encrypt">Zakoduj</string>
+    <string name="btn_decrypt">Zdekoduj</string>
+    <string name="btn_verify">Potwiedź</string>
+    <string name="unknown_crypto_signature_user_id">&lt;nieznany&gt;</string>
+    <string name="key_id">id: %s</string>
+    <string name="insufficient_apg_permissions">K-9 nie ma pełnego dostępu do APG, aby naprawić przeinstaluj K-9.</string>
+    <string name="pgp_mime_unsupported">Wiadomości PGP/MIME nie są jeszcze wspierane.</string>
+    <string name="attachment_encryption_unsupported">Uwaga: załączniki nie są jeszcze podpisane i kodowane.</string>
+    <string name="send_aborted">Anulowano.</string>
 
-    <!-- NEW: <string name="save_or_discard_draft_message_dlg_title">Save draft message?</string>-->
-    <!-- NEW: <string name="save_or_discard_draft_message_instructions_fmt">Save or Discard this message?</string>-->
+    <string name="save_or_discard_draft_message_dlg_title">Zapisać szkic?</string>
+    <string name="save_or_discard_draft_message_instructions_fmt">Zapisać czy porzucić wiadomość?</string>
 
-    <!-- NEW: <string name="charset_not_found">This message can\'t be displayed because the charset \"<xliff:g id="charset">%s</xliff:g>\" wasn\'t found.</string>-->
+    <string name="charset_not_found">Nie można wyświetlić wiadomości, ponieważ kodowanie \"<xliff:g id="charset">%s</xliff:g>\" nie zostało znalezione.</string>
 
-    <!-- NEW: <string name="select_text_now">Select text to copy.</string>-->
+    <string name="select_text_now">Wybierz tekst do skopiowania.</string>
 
-    <!-- NEW: <string name="dialog_confirm_delete_title">Confirm deletion</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_message">Do you want to delete this message?</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_confirm_button">Delete</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>-->
+    <string name="dialog_confirm_delete_title">Potwiedź usunięcie</string>
+    <string name="dialog_confirm_delete_message">Czy chcesz usunąć tą wiadomość?</string>
+    <string name="dialog_confirm_delete_confirm_button">Usuń</string>
+    <string name="dialog_confirm_delete_cancel_button">Nie usuwaj</string>
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+    <string name="dialog_confirm_spam_title">Potwierdź przeniesienie do spamu</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Na pewno przenieśc do spamu?</item>
+        <item quantity="other">Na pewno przenieśc do spamu?</item>
+<!--
+  Translators:
 
-    <!-- NEW: <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>-->
+  Please review how to handle pluralization for your language at (1) and ajust
+  the <item> elements accordingly
 
-    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
-    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
+  Possible values for 'quantity': zero, one, two, few, many, other
+
+  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
+
+-->
+    </plurals>
+    <string name="dialog_confirm_spam_confirm_button">Tak</string>
+    <string name="dialog_confirm_spam_cancel_button">Nie</string>
+
+    <string name="dialog_attachment_progress_title">Pobieranie załącznika</string>
+
+    <string name="debug_logging_enabled">Włączono logowanie debug\'u do logu Androida</string>
+
+    <string name="messagelist_sent_to_me_sigil">»</string>
+    <string name="messagelist_sent_cc_me_sigil">›</string>
     <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+
+    <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" jest niedostępne; sprawdź pamięc</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>-->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6885e3ae5..283b63674 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -6,9 +6,7 @@
     <!-- 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>-->
     <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">Autores: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisões e informações: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
     <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
@@ -140,7 +138,7 @@
 
     <string name="status_loading_more_failed">Repetindo carregamento de mensagens</string>
 
-    <string name="load_more_messages_fmt">Toque para ver mais<xliff:g id="messages_to_load">%d</xliff:g> msgs.</string>
+    <string name="load_more_messages_fmt">Toque para ver mais <xliff:g id="messages_to_load">%d</xliff:g> msgs.</string>
 
     <string name="abbrev_gigabytes">GB</string>
     <string name="abbrev_megabytes">MB</string>
@@ -200,10 +198,10 @@
     <string name="end_of_folder">Sem mais mensagens</string>
 
     <string name="accounts_welcome">
-Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código aberto para Android e é originalemente baseado no cliente de e-mail padrão do Android.
+Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código aberto para Android e é originalmente baseado no cliente de e-mail padrão do Android.
 \n
 \n\nK-9\'s recursor aprimorados incluídos:
-\n * Puchar e-mail usando IMAP IDLE
+\n * Puxar e-mail usando IMAP IDLE
 \n * Melhor performance
 \n * Reclassificação de mensagens
 \n * E-mails com assinaturas
@@ -263,6 +261,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> escreveu:\n\n</string>
     <string name="message_compose_quoted_text_label">Texto citado</string>
     <string name="message_compose_error_no_recipients">Você deve incluir ao menos um destinatário.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Alguns anexos não foram incluídos. Eles poderão ser incluídos automaticamente antes desta mensagem ser enviada.</string>
     <string name="message_compose_attachments_skipped_toast">Alguns anexos não podem ser encaminhados porque não foram inclusos na mensagem.</string>
 
@@ -339,6 +338,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="global_settings_confirm_action_archive">Arquivo</string>
     <string name="global_settings_confirm_action_delete">Excluir (apenas visualização)</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_send">Enviar</string>
 
     <string name="global_settings_privacy_mode_title">Notificações de bloqueio de tela</string>
@@ -661,7 +661,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="folder_settings_in_top_group_label">Mostrar no top group</string>
     <string name="folder_settings_in_top_group_summary">Mostrar perto do topo da lista de pastas</string>
 
-    <string name="folder_settings_folder_display_mode_label">Calsse de exibição para pasta</string>
+    <string name="folder_settings_folder_display_mode_label">Classe de exibição para pasta</string>
     <string name="folder_settings_folder_display_mode_normal">Nenhuma</string>
     <string name="folder_settings_folder_display_mode_first_class">Primeira Classe</string>
     <string name="folder_settings_folder_display_mode_second_class">Segunda Classe</string>
@@ -702,7 +702,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="account_settings_led_summary">Piscar LED quando chegar e-mail</string>
 
 
-    <string name="account_settings_servers">Configução de servidor</string>
+    <string name="account_settings_servers">Configuração de servidor</string>
 
     <string name="account_settings_composition_title">Opções para composição de uma mensagem</string>
     <string name="account_settings_composition_label">Composição padrão</string>
@@ -786,10 +786,10 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="account_clear_dlg_title">Limpar conta</string>
     <string name="account_clear_dlg_instructions_fmt">Todas as mensagens de \"<xliff:g id="account">%s</xliff:g>\" serão removidas do K-9 Mail, mas as configurações da conta serão mantidas.</string>
 
-    <string name="provider_note_live">Apenas algumas contas \"Plus\" incluem acesso POP
-        permitindo este programa se conecte. Se não estiver conseguinto logar nela com seu
+    <string name="provider_note_live">Apenas algumas contas \"Plus\" incluem acesso POP,
+        permitindo que este programa se conecte. Se não estiver conseguindo logar nela com seu
         endereço de e-mail e senha corretos, talvez você não tenha uma conta \"Plus\" paga.
-		Por favor, abra seu Web browser para conseguir acesso a estes tipos de contas.</string>
+        Por favor, abra seu Web browser para conseguir acesso a estes tipos de contas.</string>
 
     <string name="provider_note_yahoojp">Se desejar utilizar POP3 para este provedor, você deverá permitir o uso deste na página de configurações de se e-mail Yahoo.</string>
 
@@ -822,7 +822,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
 
 
 
-    <string name="account_settings_signature__location_label">Loca da Assinatura</string>
+    <string name="account_settings_signature__location_label">Local da Assinatura</string>
     <string name="account_settings_signature__location_before_quoted_text">Antes de escrever o texto</string>
     <string name="account_settings_signature__location_after_quoted_text">Depois do texto escrito</string>
     <string name="setting_theme_dark">Escuro</string>
@@ -868,7 +868,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="batch_delete_op">Excluir selecionados</string>
     <string name="batch_mark_read_op">Marcar selecionados como lidos</string>
     <string name="batch_mark_unread_op">Marcar selecionados como não lidos</string>
-    <string name="batch_flag_op">Incuir estrela para selecionados</string>
+    <string name="batch_flag_op">Incluir estrela para selecionados</string>
     <string name="batch_unflag_op">Remover estrela dos selecionados</string>
     <string name="batch_archive_op">Mover selecionados para arquivo</string>
     <string name="batch_spam_op">Mover selecionados para Spam</string>
@@ -914,8 +914,11 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="count_search_title">Contador para resultados de pesquisa</string>
     <string name="count_search_summary">Desligar visualização rápida</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
-    <string name="flagged_modifier"> - Favoritado</string>
+    <string name="flagged_modifier"> - Favorito</string>
     <string name="unread_modifier"> - Não lido</string>
 
     <string name="search_all_messages_title">Todas as mensagens</string>
@@ -937,7 +940,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="remote_control_label">Controle remoto para K-9 Mail</string>
     <string name="remote_control_desc">Permitir esta aplicação controlar atividades e configurações do K-9 Mail.</string>
 
-    <string name="font_size_settings_title">Tamanho da fornte</string>
+    <string name="font_size_settings_title">Tamanho da fonte</string>
     <string name="font_size_settings_description">Configurar tamanho da fonte</string>
 
     <string name="font_size_account_list">Lista de contas</string>
@@ -1014,6 +1017,24 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <string name="dialog_confirm_delete_confirm_button">Excluir</string>
     <string name="dialog_confirm_delete_cancel_button">Não excluir</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">O log de depuração para o sistema Android foi habilitado</string>
@@ -1021,5 +1042,10 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
     <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
     <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
     <string name="error_unable_to_connect">Não é possível conectar.</string>
-</resources>
 
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2a65dc34c..759bfd64d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,61 +3,59 @@
     <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>-->
-    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</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">Лицензия Apache License, Version 2.0.</string>
     <string name="app_authors_fmt">Авторы: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Информация об изменениях: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_libraries">Мы используем следующие тертьесторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_emoji_icons">Иконки настроения: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">читать вложения электронной почты</string>
     <string name="read_attachment_desc">Разрешать этой программе читать вложения электронной почты.</string>
-    <!-- NEW: <string name="read_messages_label">read Emails</string>-->
-    <!-- NEW: <string name="read_messages_desc">Allows this application to read your Emails.</string>-->
-    <!-- NEW: <string name="delete_messages_label">Delete Emails</string>-->
-    <!-- NEW: <string name="delete_messages_desc">Allows this application to delete your Emails.</string>-->
+    <string name="read_messages_label">Читать письма</string>
+    <string name="read_messages_desc">Разрешать этой программе читать ваши письма.</string>
+    <string name="delete_messages_label">Унитожать письма</string>
+    <string name="delete_messages_desc">Разрешать этой программе уничтожать ваши письма.</string>
 
     <string name="about_title_fmt">О программе <xliff:g id="app_name">%s</xliff:g></string>
     <string name="accounts_title">Адреса</string>
     <string name="advanced">Дополнительные параметры</string>
     <string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
-    <!-- NEW: <string name="shortcuts_title">K-9 Accounts</string>-->
+    <string name="shortcuts_title">K-9 Mail Учётные записи</string>
 
     <string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
 
     <string name="compose_title">Написать новое письмо</string>
-    <string name="debug_title">Отлажки</string>
-    <string name="choose_folder_title">Выбрать Папку</string>
-    <!-- NEW: <string name="choose_color_title">Choose a Color</string>-->
+    <string name="debug_title">Отладка</string>
+    <string name="choose_folder_title">Выберите папку</string>
+    <string name="choose_color_title">Выберите цвет</string>
 
     <string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
 
     <string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
     <string name="status_loading_account_folder">\u0020(Запрос <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_loading_account_folder_headers">\u0020(Fetching headers <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(Чтение заголовков <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(Отправка <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_processing_account">\u0020(Обработка <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(Следующий запрос @ <xliff:g id="nexttime">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
+    <string name="status_syncing_off">\u0020(Синхронизация запрещена)</string>
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Следующий</string> <!-- Used as part of a multi-step process -->
-    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">Предыдущий</string> <!-- Used as part of a multi-step process -->
     <string name="okay_action">ОК</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Отменить</string>
     <string name="send_action">Отослать</string>
-    <!-- NEW: <string name="send_again_action">Send Again</string>-->
+    <string name="send_again_action">Послать снова</string>
     <string name="select_action">Выбрать</string>
     <string name="deselect_action">Сброс выбора</string>
     <string name="reply_action">Ответить</string>
     <string name="reply_all_action">Ответить всем</string>
     <string name="delete_action">Удалить</string>
     <string name="archive_action">Архивировать</string>
-    <!-- NEW: <string name="spam_action">Spam</string>-->
+    <string name="spam_action">Спам</string>
     <string name="delete_all_action">Очистить папку</string>
     <string name="forward_action">Переслать</string>
     <string name="move_action">Переместить</string>
@@ -81,13 +79,11 @@
     <string name="open_action">Открыть</string>
     <string name="account_settings_action">Почтовые настройки</string>
     <string name="folder_settings_action">Настройки папки</string>
-    <!-- NEW: <string name="global_settings_action">Global settings</string>-->
+    <string name="global_settings_action">Глобальные настройки</string>
     <string name="remove_account_action">Удалить адрес</string>
-    <string name="clear_pending_action">Остановить незаконченные действия (опасность!)</string>
+    <string name="clear_pending_action">Остановить незаконченные действия (опасно!)</string>
 
-
-
-    <string name="accounts_action">Список почтовых ящиков</string>
+    <string name="accounts_action">Учётные записи</string>
     <string name="back_to_accounts_action">◀</string>
     <string name="back_to_folder_list_action">◀</string>
     <string name="read_action">Прочесть</string>
@@ -97,14 +93,14 @@
 
     <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>
 
     <string name="flag_action">Добавить звезду</string>
     <string name="unflag_action">Удалить звезду</string>
     <string name="copy_action">Копировать</string>
-    <!-- NEW: <string name="show_full_header_action">Show full header</string>-->
-    <!-- NEW: <string name="hide_full_header_action">Hide full header</string>-->
-    <!-- NEW: <string name="select_text_action">Select text</string>-->
+    <string name="show_full_header_action">Показать полный заголовок</string>
+    <string name="hide_full_header_action">Скрыть полный заголовок</string>
+    <string name="select_text_action">Выбрать текст</string>
 
     <string name="mark_as_unread_action">Отметить как непрочитанное</string>
     <string name="move_to_action">Переместить в</string>
@@ -113,12 +109,12 @@
     <string name="add_cc_bcc_action">Добавить Копию/СК</string>
     <string name="edit_subject_action">Редактировать тему</string>
     <string name="add_attachment_action">Добавить вложение</string>
-    <!-- NEW: <string name="add_attachment_action_image">Add attachment (Image)</string>-->
-    <!-- NEW: <string name="add_attachment_action_video">Add attachment (Video)</string>-->
+    <string name="add_attachment_action_image">Добавить вложение (Изображение)</string>
+    <string name="add_attachment_action_video">Добавить вложение (Видео)</string>
     <string name="dump_settings_action">Сброс настроек</string>
-    <string name="empty_trash_action">Опустошить Мусор</string>
+    <string name="empty_trash_action">Очистить Корзину</string>
     <string name="expunge_action">Стереть</string>
-    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
+    <string name="clear_local_folder_action">Удалить локальные сообщения</string>
     <string name="set_sort_action">Выбрать сортировку</string>
     <string name="reverse_sort_action">Обратный порядок сортировки</string>
     <string name="about_action">О Программе</string>
@@ -128,9 +124,9 @@
     <string name="folder_context_menu_title">Параметры папок</string>
 
     <string name="general_no_subject">(Без темы)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Нет даты</string>
     <string name="general_no_sender">Отправитель отсуствует</string>
-    <string name="status_loading">Запрос<xliff:g id="progress">%s</xliff:g></string>
+    <string name="status_loading">Загрузка</string>
     <string name="status_loading_folder">(Запрос <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
     <string name="status_loading_more">Загрузка сообщений\u2026</string>
     <string name="status_network_error">Ошибка при соединении</string>
@@ -140,24 +136,18 @@
 
     <string name="status_loading_more_failed">Повторите загрузку сообщений</string>
 
-    <string name="load_more_messages_fmt">Загрузить
-    еще <xliff:g id="messages_to_load">%d</xliff:g> больше</string>
+    <string name="load_more_messages_fmt">Загрузить еще <xliff:g id="messages_to_load">%d</xliff:g></string>
 
     <string name="abbrev_gigabytes">ГБ</string>
     <string name="abbrev_megabytes">МБ</string>
     <string name="abbrev_kilobytes">КБ</string>
     <string name="abbrev_bytes">Б</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>
-    <!-- NEW: <string name="recreating_account">Recreating account \"<xliff:g id="account">%s</xliff:g>\"</string>-->
+    <string name="recreating_account">Пересоздание учётной записи\"<xliff:g id="account">%s</xliff:g>\"</string>
 
     <string name="notification_new_title">Новые сообщения</string>
     <string name="notification_new_scrolling">Новое сообщение от <xliff:g id="sender">%s</xliff:g></string>
@@ -176,37 +166,35 @@
     <string name="special_mailbox_name_outbox">Исходящие</string>
     <!-- The following mailbox names will be used if the user has not specified one from the server -->
     <string name="special_mailbox_name_drafts">Черновики</string>
-    <string name="special_mailbox_name_trash">Мусор</string>
+    <string name="special_mailbox_name_trash">Корзина</string>
     <string name="special_mailbox_name_sent">Отправленные</string>
-    <!-- NEW: <string name="special_mailbox_name_archive">Archive</string>-->
-    <!-- NEW: <string name="special_mailbox_name_spam">Spam</string>-->
+    <string name="special_mailbox_name_archive">Архив</string>
+    <string name="special_mailbox_name_spam">Спам</string>
     <!-- Mailbox names displayed to user -->
 
-    <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Черновики)</string>
-    <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Мусор)</string>
-    <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Отправленные)</string>
-    <!-- NEW: <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>-->
-    <!-- NEW: <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>-->
+    <string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g></string>
+    <string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g></string>
+    <string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g></string>
+    <string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g></string>
+    <string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g></string>
 
     <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">Программа столкнулась с проблемой при отправке некоторых из Ваших сообщений.
-     В связи с родом проблемы, программа не может быть уверена либо сообщения были разосланы.
-    Адресаты, возможно, уже получили копию этих сообщений.
-    \u000a\u000aСообщения, для которых такого рода проблема возникла были помечены звездой в папке "Исходящие".
+    <string name="send_failure_body_fmt">Возникла проблема при отправке некоторых из Ваших сообщений, однако, возможно, они дошли до адресатов.
+    \u000a\u000aДанные сообщения помечены звездой в папке "Исходящие".
     Если вы удалите звезды, программа попытается отправить сообщения еще раз.
-    Нажмите на папку Исходящие и выберите "Отправить сообщения" для инициировки еще одной попытки отправки.\u000A\u000a
-    Папка <xliff:g id="errorFolder">%s</xliff:g> может содержать сообщения с ошибками о неудачах.</string>
+    Нажмите на папку Исходящие и выберите "Отправить сообщения" для еще одной попытки отправки.\u000A\u000a
+    Папка <xliff:g id="errorFolder">%s</xliff:g> может содержать сообщения о неудачах.</string>
 
-    <string name="alert_header">K-9 предупреждение</string>
+    <string name="alert_header">K-9 Mail предупреждение</string>
     <string name="no_connection_alert">Синхронизация и передача прервана из-за отсутствия сети.</string>
 
     <string name="end_of_folder">Сообщений больше нету</string>
 
     <string name="accounts_welcome">
-Добро пожаловать на K-9 Mail настройки.  K-9 это программа электронной почты для Android операционных систем с открытым исходным кодом, первоначально основанная на стандартной программе Android Mail.
+Добро пожаловать на K-9 Mail настройки.  K-9 Mail это программа электронной почты для Android операционных систем с открытым исходным кодом, первоначально основанная на стандартной программе Android Mail.
 \n
-\n\n Улучшенные возможности программы K-9 включают:
+\n\n Улучшенные возможности программы K-9 Mail включают:
 \n * Push mail при использовании IMAP IDLE
 \n * Более высокая скорость
 \n * Систематизация сообщений
@@ -218,7 +206,7 @@
 \n * Сочетания клавиш на аппаратной клавиатуре
 \n * Лучшая поддержка для IMAP
 \n * Сохранение вложений на SD карту
-\n * Вычистка мусора
+\n * Очистка Корзины
 \n * Сортировка сообщений
 \n * ... и более
 \n
@@ -227,14 +215,14 @@
 \n Просьба представлять отчеты об ошибках, запросы про разработке новых функций, и задавать вопросы на http://k9mail.googlecode.com/</string>
 
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
-    <string name="debug_enable_debug_logging_title">Включить занос в журнал отладок</string>
-    <string name="debug_enable_debug_logging_summary">Занос дополнительной диагностической информации</string>
-    <string name="debug_enable_sensitive_logging_title">Занос конфиденциальной информации</string>
-    <string name="debug_enable_sensitive_logging_summary">Может показывать пароли в журналах.</string>
+    <string name="debug_enable_debug_logging_title">Включить запись в журнал отладок</string>
+    <string name="debug_enable_debug_logging_summary">Запись дополнительной диагностической информации</string>
+    <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="message_header_mua">K-9 Mail для Android</string>
 
-    <string name="combined_inbox_title">Вся Почта</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 -->
 
@@ -243,7 +231,7 @@
                        <xliff:g id="polling">%s</xliff:g>
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
-    <string name="message_list_load_more_messages_action">Загрузить болюше сообщений</string>
+    <string name="message_list_load_more_messages_action">Загрузить больше сообщений</string>
     <string name="message_to_fmt">Для:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Удалить</string>
     <string name="message_list_mark_read_action">Отметить как прочитанное</string>
@@ -251,35 +239,35 @@
     <string name="message_list_flag_action">Добавить Звезду</string>
     <string name="message_list_unflag_action">Удалить Звезду</string>
 
-    <string name="message_compose_to_hint">Для</string>
+    <string name="message_compose_to_hint">Кому</string>
     <string name="message_compose_cc_hint">Копия</string>
     <string name="message_compose_bcc_hint">СК</string>
     <string name="message_compose_subject_hint">Тема</string>
     <string name="message_compose_content_hint">Текст сообщения</string>
     <string name="message_compose_quote_header_separator">-------- Исходное сообщение --------</string>
     <string name="message_compose_quote_header_subject">Тема:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">Послано:</string>
     <string name="message_compose_quote_header_from">От:</string>
     <string name="message_compose_quote_header_to">Для:</string>
     <string name="message_compose_quote_header_cc">Копия:</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> написал(а):\n\n</string>
     <string name="message_compose_quoted_text_label">Цитированный текст</string>
     <string name="message_compose_error_no_recipients">Необходимо добавить хотя бы одного адресата.</string>
+    <string name="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>
 
-
-
-    <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_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>
     <string name="message_view_cc_label">Копия:</string>
     <string name="message_view_attachment_view_action">Открыть</string>
     <string name="message_view_attachment_download_action">Сохранить</string>
     <string name="message_view_prev_action">\u25BC</string>
     <string name="message_view_next_action">\u25B2</string>
-    <!-- NEW: <string name="message_view_archive_action">Archive</string>-->
-    <!-- NEW: <string name="message_view_move_action">Move</string>-->
-    <!-- NEW: <string name="message_view_spam_action">Spam</string>-->
+    <string name="message_view_archive_action">Архивировать</string>
+    <string name="message_view_move_action">Перенести</string>
+    <string name="message_view_spam_action">Спам</string>
     <string name="message_view_datetime_fmt">MMM dd yyyy hh:mm a</string>
     <string name="message_view_status_attachment_saved">Вложение сохранено на карту SD под именем <xliff:g id="filename">%s</xliff:g>.</string>
     <string name="message_view_status_attachment_not_saved">Не удалось сохранить вложение на карту SD.</string>
@@ -288,22 +276,21 @@
     <string name="message_view_fetching_attachment_toast">Загрузка вложения.</string>
     <string name="message_view_no_viewer">Приложение просмотра не найдено для <xliff:g id="mimetype">%s</xliff:g>.</string>
 
-
-    <!-- NEW: <string name="message_view_download_remainder">Download complete message</string>-->
+    <string name="message_view_download_remainder">Загрузить сообщение целиком</string>
 
     <!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
-    <!-- NEW: <string name="message_additional_headers_not_downloaded">Not all headers have been downloaded or saved. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future.</string>-->
-    <!-- NEW: <string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>-->
-    <!-- NEW: <string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>-->
+    <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>
 
     <string name="new_mailbox_dlg_title">Имя новой папки</string>
 
-    <string name="folder_push_active_symbol">(Push)</string>
+    <string name="folder_push_active_symbol">(Поддержка Push Mail)</string>
 
-    <!-- NEW: <string name="from_same_sender">More from this sender</string>-->
+    <string name="from_same_sender">Еще от этого отправителя</string>
 
     <string name="message_copied_toast">Сообщение скопировано</string>
     <string name="message_moved_toast">Сообщение перенесено</string>
@@ -316,42 +303,42 @@
     <string name="about_version">Версия: <xliff:g id="version">%s</xliff:g></string>
 
 
-    <string name="global_settings_flag_label">Начало сообщения</string>
+    <string name="global_settings_flag_label">Показывать звезды</string>
     <string name="global_settings_flag_summary">Звезды указывают отмеченные сообщения</string>
     <string name="global_settings_checkbox_label">Флажки множественного выбора</string>
     <string name="global_settings_checkbox_summary">Всегда показывать Флажки множественного выбора</string>
     <string name="global_settings_touchable_label">Отображение удобное для управления пальцами</string>
-    <!-- NEW: <string name="global_settings_touchable_summary">Roomier list items with message previews</string>-->
-    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
+    <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">Показывать имя отправителя вместо e-mail, если это возмомжно</string>
+    <string name="global_settings_show_contact_name_label">Показывать имя получателя</string>
+    <string name="global_settings_show_contact_name_summary">Использовать имя получателя из списка контактов</string>
+    <string name="global_settings_registered_name_color_label">Раскраска контактов</string>
+    <string name="global_settings_registered_name_color_default">Не раскрашивать имена в списке контактов</string>
+    <string name="global_settings_registered_name_color_changed">Раскрасить имена в списке контактов</string>
 
-    <!-- NEW: <string name="global_settings_messageview_fixedwidth_label">Fixed-width fonts</string>-->
-    <!-- NEW: <string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>-->
-    <!-- NEW: <string name="global_settings_messageview_return_to_list_label">Return to list after delete</string>-->
-    <!-- NEW: <string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</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>
 
-    <!-- NEW: <string name="global_settings_confirm_actions_title">Confirm actions</string>-->
-    <!-- NEW: <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_archive">Archive</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_delete">Delete (message view only)</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_spam">Spam</string>-->
-    <!-- NEW: <string name="global_settings_confirm_action_send">Send</string>-->
+    <string name="global_settings_confirm_actions_title">Подтверждение действий</string>
+    <string name="global_settings_confirm_actions_summary">Показывать диалог при совершении действий</string>
+    <string name="global_settings_confirm_action_archive">Архивировать</string>
+    <string name="global_settings_confirm_action_delete">Удалить (только представление сообщения)</string>
+    <string name="global_settings_confirm_action_spam">Спам</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Пометить как прочитанное</string>
+    <string name="global_settings_confirm_action_send">Послать</string>
 
-    <!-- NEW: <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>-->
-    <!-- NEW: <string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>-->
+    <string name="global_settings_privacy_mode_title">Уведомления при заблокированном экране</string>
+    <string name="global_settings_privacy_mode_summary">Не показывать тему письма в уведомлениях, когда система заблокирована</string>
 
 
-    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
-    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
-    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
-    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
-
+    <string name="quiet_time">Время тишины</string>
+    <string name="quiet_time_description">Запретить сигнал, вибрацию, мигание в ночное время</string>
+    <string name="quiet_time_starts">Начинало времени тишины</string>
+    <string name="quiet_time_ends">Конец времени тишины</string>
 
     <string name="account_setup_basics_title">Установить новый адрес</string>
     <string name="account_setup_basics_instructions">Введите адрес электронной почты:</string>
@@ -367,15 +354,15 @@
     <string name="account_setup_check_settings_retr_info_msg">Получение информации об адресе\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Проверка настроек входящего сервера\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Проверка настроек исходящего сервера\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
-    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
+    <string name="account_setup_check_settings_authenticate">Аутентификация\u2026</string>
+    <string name="account_setup_check_settings_fetch">Чтение настроек учётной записи\u2026</string>
     <string name="account_setup_check_settings_finishing_msg">Завершение\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Отмена\u2026</string>
 
     <string name="account_setup_names_title">Почти готово!</string>
     <string name="account_setup_names_instructions">Ваш ящик создан и почта на пути!</string>
     <string name="account_setup_names_account_name_label">Дать этому ящику имя (необязательно):</string>
-    <string name="account_setup_names_user_name_label">Ваше имя (отображается на исходящих сообщениях):</string>
+    <string name="account_setup_names_user_name_label">Ваше имя (отображается в исходящих сообщениях):</string>
 
     <string name="account_setup_finished_toast">Ваш ящик готов!\n\nПочта загружается\u2026</string>
 
@@ -411,13 +398,13 @@
     <string name="account_setup_incoming_wifi_label">Wi-Fi</string>
     <string name="account_setup_incoming_other_label">Другие</string>
 
-    <!-- NEW: <string name="account_setup_incoming_save_all_headers_title">Download headers</string>-->
-    <!-- NEW: <string name="account_setup_incoming_save_all_headers_label">Save all message headers locally</string>-->
+    <string name="account_setup_incoming_save_all_headers_title">Загрузить заголовки</string>
+    <string name="account_setup_incoming_save_all_headers_label">Сохранить локально все заголовки</string>
 
-    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
-    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+    <string name="local_storage_provider_external_label">Внешнее хранилище (SD-карта)</string>
+    <string name="local_storage_provider_internal_label">Стандартное внутреннее хранилище</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s дополнительное внутреннее хранилище</string>
+    <string name="local_storage_provider_label">Расположение хранилища</string>
 
     <string name="account_setup_expunge_policy_label">Стирать сообщения</string>
     <string name="account_setup_expunge_policy_immediately">Сразу же после удаления или перемещения</string>
@@ -429,11 +416,11 @@
 
     <string name="drafts_folder_label">Имя папки Черновиков</string>
     <string name="sent_folder_label">Имя папки Отправленныx</string>
-    <string name="trash_folder_label">Имя папки Мусора</string>
-    <!-- NEW: <string name="archive_folder_label">Archive folder</string>-->
-    <!-- NEW: <string name="spam_folder_label">Spam folder</string>-->
+    <string name="trash_folder_label">Имя папки Корзины</string>
+    <string name="archive_folder_label">Имя папки Архива</string>
+    <string name="spam_folder_label">Имя папки Спам</string>
 
-    <!-- NEW: <string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>-->
+    <string name="account_setup_incoming_subscribed_folders_only_label">Показывать только папки из подписки</string>
     <string name="account_setup_auto_expand_folder">Автоматически открывать папку</string>
 
     <string name="account_setup_incoming_webdav_path_prefix_label">Путь для WebDAV (Exchange)</string>
@@ -470,7 +457,7 @@
 
     <string name="compact_action">Сжать данные</string>
     <string name="clear_action">Очистить все данные (опасно!)</string>
-    <!-- NEW: <string name="recreate_action">Recreate data (Last Resort!)</string>-->
+    <string name="recreate_action">Пересоздать данные (крайний случай!)</string>
 
     <string name="account_setup_options_mail_check_frequency_label">Частота опроса папок</string>
     <!-- Frequency also used in account_settings_* -->
@@ -487,19 +474,19 @@
     <string name="account_setup_options_mail_check_frequency_12hour">Каждых 12 часов</string>
     <string name="account_setup_options_mail_check_frequency_24hour">Каждых 24 часа</string>
 
-    <!-- NEW: <string name="push_poll_on_connect_label">Poll when connecting for push</string>-->
+    <string name="push_poll_on_connect_label">Запрашивать при соединении с Push Mail</string>
     <string name="account_setup_options_enable_push_label">Использовать Push Mail</string>
     <string name="account_setup_options_enable_push_summary">Если ваш сервер поддерживает такую возможность, новые сообщения появляются мгновенно. Эта опция может существенно улучшить или ухудшить скорость и эффективность всей системы.</string>
-    <!-- NEW: <string name="idle_refresh_period_label">Refresh IDLE connection</string>-->
-    <!-- NEW: <string name="idle_refresh_period_1min">Every minute</string>-->
-    <!-- NEW: <string name="idle_refresh_period_2min">Every 2 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_3min">Every 3 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_6min">Every 6 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_12min">Every 12 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_24min">Every 24 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_36min">Every 36 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_48min">Every 48 minutes</string>-->
-    <!-- NEW: <string name="idle_refresh_period_60min">Every 60 minutes</string>-->
+    <string name="idle_refresh_period_label">Обновлять неактивное соединение</string>
+    <string name="idle_refresh_period_1min">Каждую минуту</string>
+    <string name="idle_refresh_period_2min">Каждые 2 минут</string>
+    <string name="idle_refresh_period_3min">Каждые 3 минут</string>
+    <string name="idle_refresh_period_6min">Каждые 6 минут</string>
+    <string name="idle_refresh_period_12min">Каждые 12 минут</string>
+    <string name="idle_refresh_period_24min">Каждые 24 минут</string>
+    <string name="idle_refresh_period_36min">Каждые 36 минут</string>
+    <string name="idle_refresh_period_48min">Каждые 48 минут</string>
+    <string name="idle_refresh_period_60min">Каждые 60 минут</string>
 
     <string name="account_setup_options_default_label">Отправлять сообщения с этого ящика по умолчанию</string>
     <string name="account_setup_options_notify_label">Оповещать о прибытии новой почты</string>
@@ -514,8 +501,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>
-    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
-
+    <string name="account_setup_options_mail_display_count_all">все сообщения</string>
 
     <string name="move_copy_cannot_copy_unsynced_message">Не удалось скопировать или переместить сообщение, которое не было синхронизированно с сервером</string>
 
@@ -526,7 +512,7 @@
     <string name="account_setup_failed_dlg_edit_details_action">Изменить данные</string>
     <string name="account_setup_failed_dlg_continue_action">Продолжить</string>
 
-    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
+    <string name="account_settings_push_advanced_title">Расширенные</string>
     <string name="account_settings_title_fmt">Общие настройки</string>
     <string name="account_settings_default">Ящик по умолчанию</string>
     <string name="account_settings_default_label">Ящик по умолчанию</string>
@@ -539,94 +525,97 @@
     <string name="account_settings_show_combined_label">Показать комбинированную папку Входящих сообщений</string>
     <string name="account_settings_notify_self_label">Уведомлять о посланных мною сообщений</string>
     <string name="account_settings_notify_self_summary">Уведомлять даже о сообщениях, отправленных из личной почты</string>
-    <!-- NEW: <string name="account_settings_notification_opens_unread_label">Notification opens unread messages</string>-->
-    <!-- NEW: <string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</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>
 
     <string name="account_settings_hide_buttons_label">Прокрутка навигационных кнопок</string>
     <string name="account_settings_hide_buttons_never">Никогда</string>
     <string name="account_settings_hide_buttons_keyboard_avail">Когда присутствует клавиатура</string>
     <string name="account_settings_hide_buttons_always">Всегда</string>
 
-    <!-- NEW: <string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>-->
-    <!-- NEW: <string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>-->
-    <!-- NEW: <string name="account_settings_hide_move_buttons_label">Scroll refile buttons</string>-->
+    <string name="account_settings_enable_move_buttons_label">Разрешить кнопки переноса сообщений</string>
+    <string name="account_settings_enable_move_buttons_summary">Показывает кнопки: Архив, Переместить, Спам.</string>
+    <string name="account_settings_hide_move_buttons_label">Спрятать кнопки перемещения</string>
 
-    <!-- NEW: <string name="account_settings_show_pictures_label">Always show images</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_never">No</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_only_from_contacts">From contacts</string>-->
-    <!-- NEW: <string name="account_settings_show_pictures_always">From anyone</string>-->
+    <string name="account_settings_show_pictures_label">Показывать изображения</string>
+    <string name="account_settings_show_pictures_never">Никогда</string>
+    <string name="account_settings_show_pictures_only_from_contacts">От контактов</string>
+    <string name="account_settings_show_pictures_always">От всех</string>
 
     <string name="account_settings_composition">Написание сообщений</string>
 
-    <!-- NEW: <string name="account_settings_reply_after_quote_label">Reply after quoted text</string>-->
-    <!-- NEW: <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>-->
+		<string name="account_settings_default_quoted_text_shown_label">Цитировать оригинальное сообщение при ответе</string>
+		<string name="account_settings_default_quoted_text_shown_summary">Оригинальное сообщение вставляется в ответное сообщение.</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+		<string name="account_settings_reply_after_quote_label">Отвечать после цитаты</string>
+    <string name="account_settings_reply_after_quote_summary">При ответе цитата будет выше ответа.</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_message_format_label">Формат сообщения</string>
+    <string name="account_settings_message_format_text">Плоский текст (изображения и форматирование не сохраняется)</string>
+    <string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string>
 
-    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
-    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_quote_style_label">Стиль цитирования</string>
+    <string name="account_settings_quote_style_prefix">Префикс (например Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Заголовок (например Outlook, Yahoo!, Hotmail)</string>
+
+    <string name="account_settings_general_title">Общие</string>
+    <string name="account_settings_display_prefs_title">Экран</string>
     <string name="account_settings_sync">Синхронизация папок</string>
     <string name="account_settings_folders">Папки</string>
     <string name="account_settings_message_lists">Список сообщений</string>
     <string name="account_settings_message_view">Просмотр сообщений</string>
-    <!-- NEW: <string name="account_settings_quote_prefix_label">Quoted text prefix</string>-->
-    <!-- NEW: <string name="account_settings_crypto">Cryptography</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app">OpenPGP Provider</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app_none">None</string>-->
-    <!-- NEW: <string name="account_settings_crypto_app_not_available">not available</string>-->
-    <!-- NEW: <string name="account_settings_crypto_auto_signature">Auto-sign</string>-->
-    <!-- NEW: <string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>-->
+    <string name="account_settings_quote_prefix_label">Префикс цитирования</string>
+    <string name="account_settings_crypto">Криптография</string>
+    <string name="account_settings_crypto_app">OpenPGP</string>
+    <string name="account_settings_crypto_app_none">Нет</string>
+    <string name="account_settings_crypto_app_not_available">Не доступна</string>
+    <string name="account_settings_crypto_auto_signature">Автоподпись</string>
+    <string name="account_settings_crypto_auto_signature_summary">Использовать e-mail учётной записи для формирования ключа подписи.</string>
 
     <string name="account_settings_mail_check_frequency_label">Частота опроса папок</string>
     <string name="account_settings_second_class_check_frequency_label">Частота опроса папок 2-го класса</string>
 
-    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+    <string name="account_settings_storage_title">Хранилище</string>
 
 
-    <!-- NEW: <string name="account_settings_color_label">Account color</string>-->
-    <!-- NEW: <string name="account_settings_color_summary">Choose the color of the account used in folder and account list</string>-->
+    <string name="account_settings_color_label">Цвет учётной записи</string>
+    <string name="account_settings_color_summary">Выберите цвет учётной записи, используемый в папке и списке учётных записей</string>
 
-    <!-- NEW: <string name="account_settings_led_color_label">Notification LED color</string>-->
-    <!-- NEW: <string name="account_settings_led_color_summary">Choose the color your phone LED should blink for this account</string>-->
+    <string name="account_settings_led_color_label">Notification LED color</string>
+    <string name="account_settings_led_color_summary">Выбрать цвет мигания для учётной записи</string>
 
     <string name="account_settings_mail_display_count_label">Количество показываемых сообщений</string>
 
-    <!-- NEW: <string name="account_settings_autodownload_message_size_label">Fetch messages up to</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_1">1Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_2">2Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_4">4Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_8">8Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_16">16Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_32">32Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_64">64Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_128">128Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_256">256Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_512">512Kb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_1024">1Mb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_2048">2Mb</string>-->
-    <!-- NEW: <string name="account_settings_autodownload_message_size_any">any size (no limit)</string>-->
+    <string name="account_settings_autodownload_message_size_label">Загружать сообщения до</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>
+    <string name="account_settings_autodownload_message_size_8">8Kb</string>
+    <string name="account_settings_autodownload_message_size_16">16Kb</string>
+    <string name="account_settings_autodownload_message_size_32">32Kb</string>
+    <string name="account_settings_autodownload_message_size_64">64Kb</string>
+    <string name="account_settings_autodownload_message_size_128">128Kb</string>
+    <string name="account_settings_autodownload_message_size_256">256Kb</string>
+    <string name="account_settings_autodownload_message_size_512">512Kb</string>
+    <string name="account_settings_autodownload_message_size_1024">1Mb</string>
+    <string name="account_settings_autodownload_message_size_2048">2Mb</string>
+    <string name="account_settings_autodownload_message_size_any">любого размера без ограничений</string>
 
-    <!-- NEW: <string name="account_settings_message_age_label">Sync messages from</string>-->
-    <!-- NEW: <string name="account_settings_message_age_any">any time (no limit)</string>-->
-    <!-- NEW: <string name="account_settings_message_age_0">today</string>-->
-    <!-- NEW: <string name="account_settings_message_age_1">the last 2 days</string>-->
-    <!-- NEW: <string name="account_settings_message_age_2">the last 3 days</string>-->
-    <!-- NEW: <string name="account_settings_message_age_7">the last week</string>-->
-    <!-- NEW: <string name="account_settings_message_age_14">the last 2 weeks</string>-->
-    <!-- NEW: <string name="account_settings_message_age_21">the last 3 weeks</string>-->
-    <!-- NEW: <string name="account_settings_message_age_1_month">the last month</string>-->
-    <!-- NEW: <string name="account_settings_message_age_2_months">the last 2 months</string>-->
-    <!-- NEW: <string name="account_settings_message_age_3_months">the last 3 months</string>-->
-    <!-- NEW: <string name="account_settings_message_age_6_months">the last 6 months</string>-->
-    <!-- NEW: <string name="account_settings_message_age_1_year">the last year</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_folder_display_mode_label">Выбор показываемых папок</string>
@@ -655,8 +644,8 @@
     <string name="account_settings_folder_target_mode_first_and_second_class">Папки 1-го и 2-го класса</string>
     <string name="account_settings_folder_target_mode_not_second_class">Все, кроме папок 2-го класса</string>
 
-    <!-- NEW: <string name="account_settings_sync_remote_deletetions_label">Sync server deletions</string>-->
-    <!-- NEW: <string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>-->
+    <string name="account_settings_sync_remote_deletetions_label">Синхронизировать удаление на сервере</string>
+    <string name="account_settings_sync_remote_deletetions_summary">Удаляет удалённые на сервере сообщения</string>
 
     <string name="folder_settings_title">Настройки папок</string>
 
@@ -691,18 +680,17 @@
     <string name="account_settings_ring_summary">Звонок при новых сообщениях</string>
     <string name="account_settings_vibrate_enable">Вибрация</string>
     <string name="account_settings_vibrate_summary">Вибрация при новых сообщениях</string>
-    <!-- NEW: <string name="account_settings_vibrate_pattern_label">Vibration patterns</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_default">default</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_1">pattern 1</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_2">pattern 2</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_3">pattern 3</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_4">pattern 4</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_pattern_5">pattern 5</string>-->
-    <!-- NEW: <string name="account_settings_vibrate_times">Repeat vibration</string>-->
+    <string name="account_settings_vibrate_pattern_label">Паттерн вибрации</string>
+    <string name="account_settings_vibrate_pattern_default">По умолчанию</string>
+    <string name="account_settings_vibrate_pattern_1">паттерн 1</string>
+    <string name="account_settings_vibrate_pattern_2">паттерн 2</string>
+    <string name="account_settings_vibrate_pattern_3">паттерн 3</string>
+    <string name="account_settings_vibrate_pattern_4">паттерн 4</string>
+    <string name="account_settings_vibrate_pattern_5">паттерн 5</string>
+    <string name="account_settings_vibrate_times">Повторять вибрацию</string>
     <string name="account_settings_ringtone">Выбор мелодии</string>
-    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
-    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
-
+    <string name="account_settings_led_label">Мигать</string>
+    <string name="account_settings_led_summary">Мигать если получены сообщения</string>
 
     <string name="account_settings_servers">Настройки сервера</string>
 
@@ -735,21 +723,21 @@
     <string name="edit_identity_name_hint">(Необязательныо)</string>
     <string name="edit_identity_email_label">Адрес электронной почты</string>
     <string name="edit_identity_email_hint">(Обязательный)</string>
-    <!-- NEW: <string name="edit_identity_reply_to_label">Reply-to address</string>-->
-    <!-- NEW: <string name="edit_identity_reply_to_hint">(Optional)</string>-->
+    <string name="edit_identity_reply_to_label">Отвечать на адрес</string>
+    <string name="edit_identity_reply_to_hint">(Необязательно)</string>
     <string name="edit_identity_signature_label">Подпись</string>
-    <string name="edit_identity_signature_hint">(Необязательныо)</string>
+    <string name="edit_identity_signature_hint">(Необязательно)</string>
 
     <string name="account_settings_signature_use_label">Включить подпись</string>
     <string name="account_settings_signature_label">Подпись</string>
     <string name="account_settings_signature_summary">Добавить подпись к каждому отправляемому сообщению</string>
 
-    <string name="default_signature">-- \nОтправлено с мобильного телефона через К-9 Mail. Извините за краткость, пожалуйста.</string>
+    <string name="default_signature">-- \nОтправлено через К-9 Mail. Извините за краткость, пожалуйста.</string>
     <string name="default_identity_description">Первоначальная личность</string>
     <string name="choose_identity">Выбрать личность</string>
     <string name="choose_identity_title">Выбрать личность</string>
-    <!-- NEW: <string name="choose_account_title">Choose account/identity</string>-->
-    <!-- NEW: <string name="send_as">Send as</string>-->
+    <string name="choose_account_title">Выбрать учётную запись/личность</string>
+    <string name="send_as">Послать как</string>
 
 
     <string name="no_identities">Добавить личность можно в Настройке Ящиков -&gt; Управление личностями</string>
@@ -757,18 +745,18 @@
     <string name="identity_has_no_email">Личность без адреса электронной почты не позволяется.</string>
     <string name="identity_will_not_be_saved">Ваш выбор личности и изменения подписи не будут сохранены.</string>
 
-    <!-- NEW: <string name="sort_earliest_first">Earliest messages first</string>-->
-    <!-- NEW: <string name="sort_latest_first">Latest messages first</string>-->
-    <!-- NEW: <string name="sort_sender_alpha">Sender alphabetical</string>-->
-    <!-- NEW: <string name="sort_sender_re_alpha">Sender reverse alphabetical</string>-->
-    <!-- NEW: <string name="sort_subject_alpha">Subject alphabetical</string>-->
-    <!-- NEW: <string name="sort_subject_re_alpha">Subject reverse alphabetical</string>-->
-    <!-- NEW: <string name="sort_flagged_first">Starred messages first</string>-->
-    <!-- NEW: <string name="sort_flagged_last">Unstarred messages first</string>-->
-    <!-- NEW: <string name="sort_unread_first">Unread messages first</string>-->
-    <!-- NEW: <string name="sort_unread_last">Read messages first</string>-->
-    <!-- NEW: <string name="sort_attach_first">Messages with attachments first</string>-->
-    <!-- NEW: <string name="sort_unattached_first">Messages without attachments first</string>-->
+    <string name="sort_earliest_first">Сначала старые сообщения</string>
+    <string name="sort_latest_first">Сначала новые сообщения</string>
+    <string name="sort_sender_alpha">Отправитель по алфавиту</string>
+    <string name="sort_sender_re_alpha">Отправитель по алфавиту в обратном порядке</string>
+    <string name="sort_subject_alpha">Тема по алфавиту</string>
+    <string name="sort_subject_re_alpha">Тема по алфавиту в обратном порядке</string>
+    <string name="sort_flagged_first">Сначала сообщения со звёздами</string>
+    <string name="sort_flagged_last">Сначала сообщения без звёзд</string>
+    <string name="sort_unread_first">Сначала непрочитанные сообщения</string>
+    <string name="sort_unread_last">Сначала прочитанные сообщения</string>
+    <string name="sort_attach_first">Сначала сообщения с вложениями</string>
+    <string name="sort_unattached_first">Сначала сообщения без вложений</string>
 
     <string name="sort_by">Сортировка по...</string>
     <string name="sort_by_date">Дате</string>
@@ -779,25 +767,29 @@
     <string name="sort_by_attach">Вложениям</string>
     <string name="message_web_view_error">%s</string>
 
-    <string name="account_delete_dlg_title">Удалить</string>
-    <string name="account_delete_dlg_instructions_fmt">Почтовой ящик \"<xliff:g id="account">%s</xliff:g>\" будет удален.</string>
+    <string name="account_delete_dlg_title">Удалить учётную запись</string>
+    <string name="account_delete_dlg_instructions_fmt">Учётная запись \"<xliff:g id="account">%s</xliff:g>\" будет удален.</string>
 
-    <!-- NEW: <string name="account_recreate_dlg_title">Recreate Account</string>-->
-    <!-- NEW: <string name="account_recreate_dlg_instructions_fmt">All data for \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>-->
+    <string name="account_recreate_dlg_title">Пересоздать учётную запись</string>
+    <string name="account_recreate_dlg_instructions_fmt">Все данные учётной записи \"<xliff:g id="account">%s</xliff:g>\" будут уничтожены, но настройки сохранятся.</string>
 
-    <!-- NEW: <string name="account_clear_dlg_title">Clear Account</string>-->
-    <!-- NEW: <string name="account_clear_dlg_instructions_fmt">All messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>-->
+    <string name="account_clear_dlg_title">Очистить учётную запись</string>
+    <string name="account_clear_dlg_instructions_fmt">Все сообщения учётной записи \"<xliff:g id="account">%s</xliff:g>\" будут уничтожены, но настройки сохранятся.</string>
 
-    <string name="provider_note_live">Только избранные \"Plus\" ящики поддерживают получения электронной почты через \"POP"
-        и таким образом работают с этой программой. Если вы не можете подключится
-        с верными данными, то ваш тип почтового ящика не имеет такого доступа.
-        Пожалуйста, пользуйтесь мобильной версией Yahoo! Mail для получения сообщений.</string>
+    <string name="provider_note_live">Только некоторые \"Plus\" ящики поддерживают получение почты через \"POP\". Если вы не можете подключится
+        с верными данными подключения, то ваш почтовый ящик не имеет такого доступа.
+        Воспользуйтесь мобильной версией Yahoo! Mail для получения сообщений.</string>
 
-    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+    <string name="provider_note_yahoojp">Если вы хотите использовать POP3 для данного поставщика, вы должны разрешить использование POP3 на странице настроек почты Yahoo.</string>
 
-    <string name="account_setup_failed_dlg_invalid_certificate_title">Сертификат не признан</string>
-    <string name="account_setup_failed_dlg_invalid_certificate_accept">Принять Ключ</string>
-    <string name="account_setup_failed_dlg_invalid_certificate_reject">Отклонить Ключ</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>
+		<string name="provider_note_nate">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Nate.</string>
+
+		<string name="account_setup_failed_dlg_invalid_certificate_title">Сертификат не признан</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_accept">Принять сертификат</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_reject">Отклонить сертификат</string>
 
     <string name="message_help_key">Del (или D) - Удалить\u000AR -
     Ответить\u000AA - Ответить Всем\u000AF - Переслать\u000AJ or P - Предыдущее
@@ -824,51 +816,56 @@
 
 
 
-    <string name="account_settings_signature__location_label">Пизиция подписи</string>
-    <string name="account_settings_signature__location_before_quoted_text">Перед цитатой</string>
+    <string name="account_settings_signature__location_label">Размещение подписи</string>
+    <string name="account_settings_signature__location_before_quoted_text">перед цитатой</string>
     <string name="account_settings_signature__location_after_quoted_text">после цитаты</string>
     <string name="setting_theme_dark">Темное</string>
     <string name="setting_theme_light">Светлое</string>
-    <string name="display_preferences">Глобальные настройки</string>
-    <!-- NEW: <string name="global_preferences">Global</string>-->
+    <string name="display_preferences">Экран</string>
+    <string name="global_preferences">Глобальные</string>
     <string name="debug_preferences">Отладка</string>
-    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
-    <!-- NEW: <string name="network_preferences">Network</string>-->
-    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
-    <!-- NEW: <string name="accountlist_preferences">Account list</string>-->
-    <string name="messagelist_preferences">Списки Сообщений</string>
-    <!-- NEW: <string name="messageview_preferences">Messages</string>-->
+    <string name="privacy_preferences">Конфиденциальность</string>
+    <string name="network_preferences">Сеть</string>
+    <string name="interaction_preferences">Взаимодействие</string>
+    <string name="accountlist_preferences">Список учётных записей</string>
+    <string name="messagelist_preferences">Списки сообщений</string>
+    <string name="messageview_preferences">Сообщения</string>
     <string name="settings_theme_label">Изображение</string>
-    <!-- NEW: <string name="settings_language_label">Language</string>-->
+    <string name="settings_language_label">Язык</string>
 
-    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
-    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+    <string name="settings_messageview_mobile_layout_label">Режим одной колонки</string>
+    <string name="settings_messageview_mobile_layout_summary">Форматировать HTML сообщения для маленького экрана</string>
+    <string name="settings_messageview_zoom_controls_label">Системное управление зумом</string>
+    <string name="settings_messageview_zoom_controls_summary">Разрешить использование зума, если устройство его поддерживает</string>
 
-
-
-    <!-- NEW: <string name="setting_language_system">System default</string>-->
+    <string name="setting_language_system">По умолчанию</string>
 
     <string name="background_ops_label">Синхронизация в фоновом режиме</string>
     <string name="background_ops_never">Никогда</string>
     <string name="background_ops_always">Всегда</string>
-    <string name="background_ops_enabled">Когда \'Фоноввый режим\' включен</string>
-    <!-- NEW: <string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>-->
+    <string name="background_ops_enabled">Когда \'Фоновый режим\' включен</string>
+    <string name="background_ops_auto_sync">Когда \'Фоновые данные\' &amp; \'Автосинхронизация\' включены</string>
 
     <string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string>
 
     <string name="date_format_label">Формат даты</string>
-    <!-- Using default values for date_format_* strings -->
+	<!--
+				The values of the date_format_* strings MUST be valid date format strings.
+				See Android SDK documentation for the class SimpleDateFormat.
+			-->
+		<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_iso8601">yyyy-MM-dd</string>
 
-    <string name="batch_ops">Групповые операции</string>
+		<string name="batch_ops">Групповые операции</string>
     <string name="batch_delete_op">Удалить выбранное</string>
     <string name="batch_mark_read_op">Пометить выбранное как прочитанное</string>
     <string name="batch_mark_unread_op">Пометить выбранное как не прочитанное</string>
     <string name="batch_flag_op">Пометить выбранное звездами</string>
     <string name="batch_unflag_op">Удалить звезды с выбранных</string>
-    <!-- NEW: <string name="batch_archive_op">Move selected to Archive</string>-->
-    <!-- NEW: <string name="batch_spam_op">Move selected to Spam</string>-->
+    <string name="batch_archive_op">Переместить выбранные в Архив</string>
+    <string name="batch_spam_op">Переместить выбранные в Спам</string>
     <string name="batch_move_op">Переместить выбранное</string>
     <string name="batch_copy_op">Скопировать выбранное</string>
     <string name="batch_flag_mode">Режим звезд</string>
@@ -891,37 +888,40 @@
     <string name="gestures_title">Жесты</string>
     <string name="gestures_summary">Принимать контроль жестами</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_title">Компактное размещение</string>
+    <string name="compact_layouts_summary">Настроить размещение для отображения максимума на каждой странице</string>
 
-    <!-- NEW: <string name="volume_navigation_title">Volume key navigation</string>-->
-    <!-- NEW: <string name="volume_navigation_summary">Flip through items using the volume controls</string>-->
-    <!-- NEW: <string name="volume_navigation_message">Message view</string>-->
-    <!-- NEW: <string name="volume_navigation_list">Various list views</string>-->
+    <string name="volume_navigation_title">Использовать управление громкостью для навигации</string>
+    <string name="volume_navigation_summary">Перемещаться по элементам, используя управление громкостью</string>
+    <string name="volume_navigation_message">Сообщение</string>
+    <string name="volume_navigation_list">Различные списки элементов</string>
 
-    <!-- NEW: <string name="manage_back_title">Manage \"Back\" button</string>-->
-    <!-- NEW: <string name="manage_back_summary">Make \"Back\" always go up a level</string>-->
+    <string name="manage_back_title">Использовать кнопку \"Назад\"</string>
+    <string name="manage_back_summary">\"Назад\" всегда возвращает на уровень вверх</string>
 
-    <!-- NEW: <string name="start_integrated_inbox_title">Start in Unified Inbox</string>-->
-    <!-- NEW: <string name="start_integrated_inbox_summary">Show the Unified Inbox after startup</string>-->
+    <string name="start_integrated_inbox_title">Входить в общий ящик при запуске</string>
+    <string name="start_integrated_inbox_summary">Показать общий ящик сообщений после запуска</string>
 
-    <!-- NEW: <string name="measure_accounts_title">Show account size</string>-->
-    <!-- NEW: <string name="measure_accounts_summary">Turn off for faster display</string>-->
+    <string name="measure_accounts_title">Показать размер учётной записи</string>
+    <string name="measure_accounts_summary">Выключите для быстрого отображения</string>
 
-    <!-- NEW: <string name="count_search_title">Count search results</string>-->
-    <!-- NEW: <string name="count_search_summary">Turn off for faster display</string>-->
+    <string name="count_search_title">Считать результаты поиска</string>
+    <string name="count_search_summary">Выключите для быстрого отображения</string>
 
-    <!-- NEW: <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>-->
-    <!-- NEW: <string name="flagged_modifier"> - Starred</string>-->
-    <!-- NEW: <string name="unread_modifier"> - Unread</string>-->
+    <string name="hide_special_accounts_title">Спрятать специальные учётные записи</string>
+    <string name="hide_special_accounts_summary">Спрятать объединённый ящик со входящими письмами и все учётные записи сообщений</string>
 
-    <!-- NEW: <string name="search_all_messages_title">All messages</string>-->
-    <!-- NEW: <string name="search_all_messages_detail">All messages in searchable folders</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"> - Помеченные</string>
+    <string name="unread_modifier"> - Непрочитанные</string>
+
+    <string name="search_all_messages_title">Все сообщения</string>
+    <string name="search_all_messages_detail">Все сообщения в папках для поика</string>
 
     <string name="integrated_inbox_title">Объединенная папка входящей почты (непрочитанное)</string>
     <string name="integrated_inbox_detail">Все непрочитанные сообщения в объединенных папках</string>
 
-    <!-- NEW: <string name="tap_hint">Tap envelope or star for unread or starred messages</string>-->
+    <string name="tap_hint">Нажмите конверт или звездочку для непрочитанных или помеченных звездой сообщений</string>
 
     <string name="folder_settings_include_in_integrated_inbox_label">Объединить</string>
     <string name="folder_settings_include_in_integrated_inbox_summary">Показывать непрочитанные сообщения в объединенной папке</string>
@@ -934,88 +934,111 @@
     <string name="remote_control_label">Дистанционное управление K-9 Mail</string>
     <string name="remote_control_desc">Позволяет этому приложению управлеть деятельностью и настройками K-9 Mail.</string>
 
-    <!-- NEW: <string name="font_size_settings_title">Font size</string>-->
-    <!-- NEW: <string name="font_size_settings_description">Configure font size</string>-->
+	<string name="font_size_settings_title">Размер шрифта</string>
+	<string name="font_size_settings_description">Настройте размер шрифта</string>
 
-    <!-- NEW: <string name="font_size_account_list">Account list</string>-->
-    <!-- NEW: <string name="font_size_account_name">Account name</string>-->
-    <!-- NEW: <string name="font_size_account_description">Account description</string>-->
+	<string name="font_size_account_list">Список учётных записей</string>
+	<string name="font_size_account_name">Название учётной записи</string>
+	<string name="font_size_account_description">Описание учётной записи</string>
 
-    <!-- NEW: <string name="font_size_folder_list">Folder lists</string>-->
-    <!-- NEW: <string name="font_size_folder_name">Folder name</string>-->
-    <!-- NEW: <string name="font_size_folder_status">Folder status</string>-->
+	<string name="font_size_folder_list">Список папок</string>
+	<string name="font_size_folder_name">Имя папки</string>
+	<string name="font_size_folder_status">Статус папки</string>
 
-    <!-- NEW: <string name="font_size_message_list">Message lists</string>-->
-    <!-- NEW: <string name="font_size_message_list_subject">Subject</string>-->
-    <!-- NEW: <string name="font_size_message_list_sender">Sender</string>-->
-    <!-- NEW: <string name="font_size_message_list_date">Date</string>-->
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+	<string name="font_size_message_list">Список сообщений</string>
+	<string name="font_size_message_list_subject">Тема</string>
+	<string name="font_size_message_list_sender">Отпрвитель</string>
+	<string name="font_size_message_list_date">Дата</string>
+	<string name="font_size_message_list_preview">Предпросмотр</string>
 
-    <!-- NEW: <string name="font_size_message_view">Messages</string>-->
-    <!-- NEW: <string name="font_size_message_view_sender">Sender</string>-->
-    <!-- NEW: <string name="font_size_message_view_to">To</string>-->
-    <!-- NEW: <string name="font_size_message_view_cc">Cc</string>-->
-    <!-- NEW: <string name="font_size_message_view_additional_headers">Additional headers</string>-->
-    <!-- NEW: <string name="font_size_message_view_subject">Subject</string>-->
-    <!-- NEW: <string name="font_size_message_view_time">Time</string>-->
-    <!-- NEW: <string name="font_size_message_view_date">Date</string>-->
-    <!-- NEW: <string name="font_size_message_view_content">Message body</string>-->
+	<string name="font_size_message_view">Сообщения</string>
+	<string name="font_size_message_view_sender">отправитель</string>
+	<string name="font_size_message_view_to">Кому</string>
+	<string name="font_size_message_view_cc">Скрытая копия</string>
+	<string name="font_size_message_view_additional_headers">дополнительные заголовки</string>
+	<string name="font_size_message_view_subject">Тема</string>
+	<string name="font_size_message_view_time">Время</string>
+	<string name="font_size_message_view_date">Дата</string>
+	<string name="font_size_message_view_content">Тело сообщения</string>
 
-    <!-- NEW: <string name="font_size_tiniest">Tiniest</string>-->
-    <!-- NEW: <string name="font_size_tiny">Tiny</string>-->
-    <!-- NEW: <string name="font_size_smaller">Smaller</string>-->
-    <!-- NEW: <string name="font_size_small">Small</string>-->
-    <!-- NEW: <string name="font_size_medium">Medium</string>-->
-    <!-- NEW: <string name="font_size_large">Large</string>-->
-    <!-- NEW: <string name="font_size_larger">Larger</string>-->
+	<string name="font_size_tiniest">самый крочшечный</string>
+	<string name="font_size_tiny">Крошечный</string>
+	<string name="font_size_smaller">Еще меньше</string>
+	<string name="font_size_small">Маленький</string>
+	<string name="font_size_medium">средний</string>
+	<string name="font_size_large">Большой</string>
+	<string name="font_size_larger">Наибольший</string>
 
-    <!-- NEW: <string name="font_size_webview_smaller">Smallest</string>-->
-    <!-- NEW: <string name="font_size_webview_small">Smaller</string>-->
-    <!-- NEW: <string name="font_size_webview_normal">Normal</string>-->
-    <!-- NEW: <string name="font_size_webview_large">Larger</string>-->
-    <!-- NEW: <string name="font_size_webview_larger">Largest</string>-->
+	<string name="font_size_webview_smaller">Крошечный</string>
+	<string name="font_size_webview_small">Маленький</string>
+	<string name="font_size_webview_normal">Нормальный</string>
+	<string name="font_size_webview_large">Большой</string>
+	<string name="font_size_webview_larger">Наибольший</string>
 
-    <!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
-    <!-- NEW: <string name="message_compose_buggy_gallery">Check \"Settings\" -&gt; \"Use Gallery bug work-around\" to be able to attach images or videos using Gallery 3D.</string>-->
+	<!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
+		 <string name="message_compose_buggy_gallery">Выберите \"Настройка\" -&gt; \"Использовать обход проблемы...\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
 
-    <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
-    <!-- NEW: <string name="message_compose_use_workaround">Use \"Add attachment (Image)\" or \"Add attachment (Video)\" to attach images or videos with Gallery 3D.</string>-->
+		 <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
+		 <string name="message_compose_use_workaround">Выберите \"Добавить вложение (Картинка)\" или "Добвить вложение (Видео)\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
 
-    <!-- NEW: <string name="miscellaneous_preferences">Miscellaneous</string>-->
-    <!-- NEW: <string name="misc_preferences_attachment_title">Use Gallery bug work-around</string>-->
-    <!-- NEW: <string name="misc_preferences_attachment_description">Show buttons to add image/video attachments (to work around a Gallery 3D bug)</string>-->
+		 <string name="miscellaneous_preferences">Разное</string>
+		 <string name="misc_preferences_attachment_title">Использовать обход проблемы с \"Использовать галерею\"</string>
+		 <string name="misc_preferences_attachment_description">Показывать кнопки для добавления картинок и видео вложений (чтобы обойти проблемы с 3D в Gallery)</string>
+		 <!-- APG related -->
+		 <string name="error_activity_not_found">Нет подходящего приложения для действия.</string>
+		 <string name="error_apg_version_not_supported">Установленная версия APG не поддерживается.</string>
+		 <string name="btn_crypto_sign">подписать</string>
+		 <string name="btn_encrypt">Зашифровать</string>
+		 <string name="btn_decrypt">Расшифровать</string>
+		 <string name="btn_verify">проверить</string>
+		 <string name="unknown_crypto_signature_user_id">&lt;неизвестный&gt;</string>
+		 <string name="key_id">id: %s</string>
+		 <string name="insufficient_apg_permissions">K-9 Mail не имеет разрешения для полного доступа к APG, please пожалуйста переустановите приложение.</string>
+		 <string name="pgp_mime_unsupported">PGP/MIME сообщения пока не поддерживаются.</string>
+		 <string name="attachment_encryption_unsupported">Предупреждение: вложения еще не подписаны и не зашифрованы.</string>
+		 <string name="send_aborted">Отправка отменена.</string>
 
-    <!-- APG related -->
-    <!-- NEW: <string name="error_activity_not_found">No suitable application for this action found.</string>-->
-    <!-- NEW: <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>-->
-    <!-- NEW: <string name="btn_crypto_sign">Sign</string>-->
-    <!-- NEW: <string name="btn_encrypt">Encrypt</string>-->
-    <!-- NEW: <string name="btn_decrypt">Decrypt</string>-->
-    <!-- NEW: <string name="btn_verify">Verify</string>-->
-    <!-- NEW: <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>-->
-    <!-- NEW: <string name="key_id">id: %s</string>-->
-    <!-- NEW: <string name="insufficient_apg_permissions">K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that.</string>-->
-    <!-- NEW: <string name="pgp_mime_unsupported">PGP/MIME messages are not supported yet.</string>-->
-    <!-- NEW: <string name="attachment_encryption_unsupported">Warning: attachments are NOT signed or encrypted yet.</string>-->
-    <!-- NEW: <string name="send_aborted">Send aborted.</string>-->
+		 <string name="save_or_discard_draft_message_dlg_title">Сохранить черновик сообщения?</string>
+		 <string name="save_or_discard_draft_message_instructions_fmt">Сохранить или уничтожить сообщение?</string>
 
-    <!-- NEW: <string name="save_or_discard_draft_message_dlg_title">Save draft message?</string>-->
-    <!-- NEW: <string name="save_or_discard_draft_message_instructions_fmt">Save or Discard this message?</string>-->
+		 <string name="charset_not_found">Это сообщение не может быть отображено, так как кодовая страница \"<xliff:g id="charset">%s</xliff:g>\" не найдена.</string>
 
-    <!-- NEW: <string name="charset_not_found">This message can\'t be displayed because the charset \"<xliff:g id="charset">%s</xliff:g>\" wasn\'t found.</string>-->
+		 <string name="select_text_now">Выберите текс для копирования.</string>
 
-    <!-- NEW: <string name="select_text_now">Select text to copy.</string>-->
+		 <string name="dialog_confirm_delete_title">Подтвердите удаление</string>
+		 <string name="dialog_confirm_delete_message">Вы хотите удалить это сообщение?</string>
+		 <string name="dialog_confirm_delete_confirm_button">Удалить</string>
+		 <string name="dialog_confirm_delete_cancel_button">Не удалять</string>
 
-    <!-- NEW: <string name="dialog_confirm_delete_title">Confirm deletion</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_message">Do you want to delete this message?</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_confirm_button">Delete</string>-->
-    <!-- NEW: <string name="dialog_confirm_delete_cancel_button">Do not delete</string>-->
+		 <string name="dialog_confirm_spam_title">Подтвердите перенос в папку Спам</string>
+		 <plurals name="dialog_confirm_spam_message">
+				 <item quantity="one">Вы действительно хотите переместить сообщение в папку Спам?</item>
+				 <item quantity="other">Вы действительно хотите переместить <xliff:g id="message_count">%1$d</xliff:g> сообщений в папку Спам?</item>
+<!--
+	 Translators:
 
-    <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
+	 Please review how to handle pluralization for your language at (1) and ajust
+	 the <item> elements accordingly
 
-    <!-- NEW: <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>-->
+	 Possible values for 'quantity': zero, one, two, few, many, other
 
-    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
-    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
-    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+	 (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
+-->
+		 </plurals>
+		 <string name="dialog_confirm_spam_confirm_button">Да</string>
+		 <string name="dialog_confirm_spam_cancel_button">Нет</string>
+
+		 <string name="dialog_attachment_progress_title">Скачивание вложения</string>
+
+		 <string name="debug_logging_enabled">Разрешить журналирование отладочной информайии</string>
+
+		 <string name="messagelist_sent_to_me_sigil">»</string>
+		 <string name="messagelist_sent_cc_me_sigil">›</string>
+		 <string name="error_unable_to_connect">Не получается соединиться.</string>
+
+		 <string name="account_unavailable">Учётная запись\"<xliff:g id="account">%s</xliff:g>\" недоступна; проверьте хранилище</string>
+
+		 <string name="settings_attachment_default_path">Сохранять вложения в...</string>
+		 <string name="attachment_save_title">Сохранить вложение</string>
+		 <string name="attachment_save_desc">Не найден браузер файлов. Где бы вы хотели сохранить вложение?</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 707335946..a9b11cf75 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3,14 +3,12 @@
     <string name="app_name">K-9 E-post</string>
     <string name="beta_app_name">K-9 E-post 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>-->
-    <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
+    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Vissa delar Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+    <string name="app_license">Licensierat under Apache-licensen, version 2.0.</string>
     <string name="app_authors_fmt">Upphovsmän: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revisionsinformation: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
-    <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
-    <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
+    <string name="app_libraries">Vi använder följande tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_emoji_icons">Emoji-ikoner: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
     <string name="read_attachment_label">Läs bilagor</string>
     <string name="read_attachment_desc">Tillåter denna applikation att läsa bifogade filer.</string>
@@ -42,15 +40,15 @@
     <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(Nästa kontroll @ <xliff:g id="nexttime">%s</xliff:g>)</string>
-    <!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
+    <string name="status_syncing_off">\u0020(Synk avaktiverat)</string>
 
     <!-- Actions will be used as buttons and in menu items -->
     <string name="next_action">Nästa</string> <!-- Used as part of a multi-step process -->
-    <!-- NEW: <string name="previous_action">Previous</string>--> <!-- Used as part of a multi-step process -->
+    <string name="previous_action">Föregående</string> <!-- Used as part of a multi-step process -->
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Avbryt</string>
     <string name="send_action">Skicka</string>
-    <!-- NEW: <string name="send_again_action">Send Again</string>-->
+    <string name="send_again_action">Skicka igen</string>
     <string name="select_action">Markera</string>
     <string name="deselect_action">Avmarkera</string>
     <string name="reply_action">Svara</string>
@@ -118,7 +116,7 @@
     <string name="dump_settings_action">Dumpa inställningar</string>
     <string name="empty_trash_action">Töm papperskorg</string>
     <string name="expunge_action">Utplåna</string>
-    <!-- NEW: <string name="clear_local_folder_action">Clear local messages</string>-->
+    <string name="clear_local_folder_action">Rensa lokalt lagrade meddelanden</string>
     <string name="set_sort_action">Välj sortering</string>
     <string name="reverse_sort_action">Omvänd sortering</string>
     <string name="about_action">Om</string>
@@ -128,7 +126,7 @@
     <string name="folder_context_menu_title">Mappinställningar</string>
 
     <string name="general_no_subject">(Inget ämne)</string> <!-- Shown in place of the subject when a message has no subject. Showing this in parentheses is customary. -->
-    <!-- NEW: <string name="general_no_date">No date</string>-->
+    <string name="general_no_date">Inget datum</string>
     <string name="general_no_sender">Ingen avsändare</string>
     <string name="status_loading">Kontrollerar</string>
     <string name="status_loading_folder">(Kontrollerar <xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@@ -260,13 +258,14 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="message_compose_content_hint">Meddelandetext</string>
     <string name="message_compose_quote_header_separator">-------- Originalmeddelande --------</string>
     <string name="message_compose_quote_header_subject">Ämne:</string>
-    <!-- NEW: <string name="message_compose_quote_header_send_date">Sent:</string>-->
+    <string name="message_compose_quote_header_send_date">Skickat:</string>
     <string name="message_compose_quote_header_from">Från:</string>
     <string name="message_compose_quote_header_to">Till:</string>
     <string name="message_compose_quote_header_cc">CC:</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> skrev:\n\n</string>
     <string name="message_compose_quoted_text_label">Citerad text</string>
     <string name="message_compose_error_no_recipients">Du måste ange åtminstone en mottagare.</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">Några bilagor hämtades inte. De kommer att hämtas automatiskt innan detta brev sänds.</string>
     <string name="message_compose_attachments_skipped_toast">Några bilagor kan inte vidarebefordras eftersom de inte har hämtats.</string>
 
@@ -324,14 +323,14 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_checkbox_summary">Visa alltid checkboxar för flerval</string>
     <string name="global_settings_touchable_label">Touch-vänlig vy</string>
     <string name="global_settings_touchable_summary">Rymligare listobjekt med förhandsgranskningar</string>
-    <!-- NEW: <string name="global_settings_preview_lines_label">Preview lines</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_label">Show correspondent names</string>-->
-    <!-- NEW: <string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_label">Show contact names</string>-->
-    <!-- NEW: <string name="global_settings_show_contact_name_summary">Use recipient names from Contacts when available</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_label">Colorize contacts</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>-->
-    <!-- NEW: <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>-->
+    <string name="global_settings_preview_lines_label">Förhandsgranska rader</string>
+    <string name="global_settings_show_correspondent_names_label">Visa korrespondensnamn</string>
+    <string name="global_settings_show_correspondent_names_summary">Visa namn på korrespondens hellre än e-post-adresser</string>
+    <string name="global_settings_show_contact_name_label">Visa kontaktnamn</string>
+    <string name="global_settings_show_contact_name_summary">Använd avsändarnamn ifrån kontakter när tillgängligt</string>
+    <string name="global_settings_registered_name_color_label">Färglägg kontakter</string>
+    <string name="global_settings_registered_name_color_default">Färglägg inte namn i kontaktlistan</string>
+    <string name="global_settings_registered_name_color_changed">Färglägg namn i kontaktlistan</string>
 
     <string name="global_settings_messageview_fixedwidth_label">Teckensnitt med fast bredd</string>
     <string name="global_settings_messageview_fixedwidth_summary">Använd ett teckensnitt med fast bredd för att visa brev med enbart text</string>
@@ -343,16 +342,17 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="global_settings_confirm_action_archive">Arkivera</string>
     <string name="global_settings_confirm_action_delete">Radera (endast meddelandevyn)</string>
     <string name="global_settings_confirm_action_spam">Skräp</string>
+    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">Skicka</string>
 
     <string name="global_settings_privacy_mode_title">Privatläge</string>
     <string name="global_settings_privacy_mode_summary">Visa inte e-postens ämnen i notifieringsytan när systemet är låst</string>
 
 
-    <!-- NEW: <string name="quiet_time">Quiet Time</string>-->
-    <!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
-    <!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
-    <!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
+    <string name="quiet_time">Tyst tid</string>
+    <string name="quiet_time_description">Avaktivera ringsignaler, vibration och blinkande på natten</string>
+    <string name="quiet_time_starts">Tyst tid börjar</string>
+    <string name="quiet_time_ends">Tyst tid slutar</string>
 
 
     <string name="account_setup_basics_title">Konfigurera ett nytt konto</string>
@@ -369,8 +369,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_check_settings_retr_info_msg">Hämtar kontoinformation\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Kontrollerar inställningar för inkommande server\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Kontrollerar inställningar för utgående server\u2026</string>
-    <!-- NEW: <string name="account_setup_check_settings_authenticate">Authenticating\u2026</string>-->
-    <!-- NEW: <string name="account_setup_check_settings_fetch">Fetching account settings\u2026</string>-->
+    <string name="account_setup_check_settings_authenticate">Authentiserar\u2026</string>
+    <string name="account_setup_check_settings_fetch">Hämtar kontoinställningar\u2026</string>
     <string name="account_setup_check_settings_finishing_msg">Avslutar\u2026</string>
     <string name="account_setup_check_settings_canceling_msg">Avbryter\u2026</string>
 
@@ -416,10 +416,10 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_incoming_save_all_headers_title">Nerladdning av e-post-huvuden</string>
     <string name="account_setup_incoming_save_all_headers_label">Spara alla huvuden lokalt</string>
 
-    <!-- NEW: <string name="local_storage_provider_external_label">External storage (SD card)</string>-->
-    <!-- NEW: <string name="local_storage_provider_internal_label">Regular internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_samsunggalaxy_label">%1$s additional internal storage</string>-->
-    <!-- NEW: <string name="local_storage_provider_label">Storage location</string>-->
+    <string name="local_storage_provider_external_label">Extern lagring (SD-kort)</string>
+    <string name="local_storage_provider_internal_label">Vanlig intern lagring</string>
+    <string name="local_storage_provider_samsunggalaxy_label">%1$s ytterligare intern lagring</string>
+    <string name="local_storage_provider_label">Lagringsplacering</string>
 
     <string name="account_setup_expunge_policy_label">Utplåna e-post</string>
     <string name="account_setup_expunge_policy_immediately">Direkt efter radering eller flytt</string>
@@ -516,7 +516,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_options_mail_display_count_250">250 brev</string>
     <string name="account_setup_options_mail_display_count_500">500 brev</string>
     <string name="account_setup_options_mail_display_count_1000">1000 brev</string>
-    <!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
+    <string name="account_setup_options_mail_display_count_all">alla brev</string>
 
 
     <string name="move_copy_cannot_copy_unsynced_message">Kan inte kopiera eller flytta ett brev som inte är synkroniserat med servern</string>
@@ -528,7 +528,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_setup_failed_dlg_edit_details_action">Redigera detaljer</string>
     <string name="account_setup_failed_dlg_continue_action">Fortsätt</string>
 
-    <!-- NEW: <string name="account_settings_push_advanced_title">Advanced</string>-->
+    <string name="account_settings_push_advanced_title">Advancerat</string>
     <string name="account_settings_title_fmt">Allmänna inställningar</string>
     <string name="account_settings_default">Standardkonto</string>
     <string name="account_settings_default_label">Standardkonto</string>
@@ -543,8 +543,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_notify_self_summary">Notifiera även för e-post som jag själv har skickat</string>
     <string name="account_settings_notification_opens_unread_label">Notifieringar öppnar oläst e-post</string>
     <string name="account_settings_notification_opens_unread_summary">Letar efter oläst e-post när notifieringen öppnas</string>
-    <!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
-    <!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
+    <string name="account_settings_notification_unread_count_label">Visa antal olästa</string>
+    <string name="account_settings_notification_unread_count_summary">Visar antalet olästa brev i notifieringsytan.</string>
 
     <string name="account_settings_hide_buttons_label">Scrolla navigationsknappar</string>
     <string name="account_settings_hide_buttons_never">Aldrig</string>
@@ -565,16 +565,16 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_reply_after_quote_label">Svar efter citat</string>
     <string name="account_settings_reply_after_quote_summary">Vid svar på e-post placeras originalmeddelandet ovanför ditt svar.</string>
 
-    <!-- NEW: <string name="account_settings_message_format_label">Message Format</string>-->
-    <!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
-    <!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
+    <string name="account_settings_message_format_label">Brevformat</string>
+    <string name="account_settings_message_format_text">Ren text (bilder och formatering tas bort)</string>
+    <string name="account_settings_message_format_html">HTML (bilder och formatering behålls)</string>
 
-    <!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
-    <!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
+    <string name="account_settings_quote_style_label">Citationsstil vid svar</string>
+    <string name="account_settings_quote_style_prefix">Prefix (som Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Header (som Outlook, Yahoo!, Hotmail)</string>
 
-    <!-- NEW: <string name="account_settings_general_title">General settings</string>-->
-    <!-- NEW: <string name="account_settings_display_prefs_title">Display</string>-->
+    <string name="account_settings_general_title">Allmänna inställningar</string>
+    <string name="account_settings_display_prefs_title">Utseende</string>
     <string name="account_settings_sync">Mappsynkronisering</string>
     <string name="account_settings_folders">Mappar</string>
     <string name="account_settings_message_lists">Lista e-post</string>
@@ -590,7 +590,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_mail_check_frequency_label">Frekvens för att kontrollera mappar</string>
     <string name="account_settings_second_class_check_frequency_label">Frekvens för kontroll av andra klass</string>
 
-    <!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
+    <string name="account_settings_storage_title">Lagring</string>
 
 
     <string name="account_settings_color_label">Kontofärg</string>
@@ -702,8 +702,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_vibrate_pattern_5">mönster 5</string>
     <string name="account_settings_vibrate_times">Antal vibrationer</string>
     <string name="account_settings_ringtone">Ringsignal för ny e-post</string>
-    <!-- NEW: <string name="account_settings_led_label">Blink LED</string>-->
-    <!-- NEW: <string name="account_settings_led_summary">Blink LED when mail arrives</string>-->
+    <string name="account_settings_led_label">Blinka LED</string>
+    <string name="account_settings_led_summary">Blinka LED när det kommer ny e-post</string>
 
 
     <string name="account_settings_servers">Serverinställningar</string>
@@ -751,7 +751,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="choose_identity">Välj identitet</string>
     <string name="choose_identity_title">Välj identitet</string>
     <string name="choose_account_title">Välj konto/identitet</string>
-    <!-- NEW: <string name="send_as">Send as</string>-->
+    <string name="send_as">Skicka som</string>
 
 
     <string name="no_identities">Gå till Kontoinställningar -&gt; Hantera identiteter för att skapa en identitet</string>
@@ -785,7 +785,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas från K-9 E-post.</string>
 
     <string name="account_recreate_dlg_title">Återskapa konto</string>
-    <string name="account_recreate_dlg_instructions_fmt">All data för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
+    <string name="account_recreate_dlg_instructions_fmt">Alla meddelanden, bifogade filer, mappar och inställningar mapp för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
 
     <string name="account_clear_dlg_title">Rensa konto</string>
     <string name="account_clear_dlg_instructions_fmt">All e-post i \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas ifrån K-9 E-post, men kontoinställningar behålls.</string>
@@ -795,7 +795,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
         med din korrekta adress och lösenord så kanske du inte har ett betalt
         \"Plus\"-konto. Vänligen starta webbläsaren för att komma åt dessa konton.</string>
 
-    <!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
+    <string name="provider_note_yahoojp">Om du vill använda POP3 med denna leverantör måste du välja att tillåta POP3 på inställningssidan för Yahoo!.</string>
 
     <string name="account_setup_failed_dlg_invalid_certificate_title">Okänt Certifikat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptera nyckel</string>
@@ -831,22 +831,22 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="account_settings_signature__location_after_quoted_text">Efter citerad text</string>
     <string name="setting_theme_dark">Mörk</string>
     <string name="setting_theme_light">Ljus</string>
-    <!-- NEW: <string name="display_preferences">Display</string>-->
-    <!-- NEW: <string name="global_preferences">Global</string>-->
-    <string name="debug_preferences">Debugging</string>
-    <!-- NEW: <string name="privacy_preferences">Privacy</string>-->
-    <!-- NEW: <string name="network_preferences">Network</string>-->
-    <!-- NEW: <string name="interaction_preferences">Interaction</string>-->
+    <string name="display_preferences">Utseende</string>
+    <string name="global_preferences">Globala inställningar</string>
+    <string name="debug_preferences">Avlusning</string>
+    <string name="privacy_preferences">Sekretess</string>
+    <string name="network_preferences">Nätverk</string>
+    <string name="interaction_preferences">Interaktion</string>
     <string name="accountlist_preferences">Kontolista</string>
     <string name="messagelist_preferences">E-post-listor</string>
     <string name="messageview_preferences">Brev</string>
     <string name="settings_theme_label">Tema</string>
     <string name="settings_language_label">Språk</string>
 
-    <!-- NEW: <string name="settings_messageview_mobile_layout_label">Single-column layout</string>-->
-    <!-- NEW: <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_label">System zoom controls</string>-->
-    <!-- NEW: <string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>-->
+    <string name="settings_messageview_mobile_layout_label">En-kolumns-layout</string>
+    <string name="settings_messageview_mobile_layout_summary">Formatera om HTML-brev för mindre skärmar</string>
+    <string name="settings_messageview_zoom_controls_label">Kontroll av zoom</string>
+    <string name="settings_messageview_zoom_controls_summary">Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det</string>
 
 
 
@@ -900,8 +900,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="gestures_title">Gester</string>
     <string name="gestures_summary">Acceptera gestkontroll</string>
 
-    <!-- NEW: <string name="compact_layouts_title">Compact layouts</string>-->
-    <!-- NEW: <string name="compact_layouts_summary">Adjust layouts to display more on each page</string>-->
+    <string name="compact_layouts_title">Komprimera vyer</string>
+    <string name="compact_layouts_summary">Tryck ihop vyer för att kunna visa mer på varje sida</string>
 
     <string name="volume_navigation_title">Volym upp/ner-navigering</string>
     <string name="volume_navigation_summary">Växla mellan val med hjälp av volymkontrollerna</string>
@@ -920,6 +920,9 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="count_search_title">Räkna sökresultat</string>
     <string name="count_search_summary">Avaktivera för snabbare visning</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - Stjärnmärkta</string>
     <string name="unread_modifier"> - Olästa</string>
@@ -958,7 +961,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="font_size_message_list_subject">Ämne</string>
     <string name="font_size_message_list_sender">Avsändare</string>
     <string name="font_size_message_list_date">Datum</string>
-    <!-- NEW: <string name="font_size_message_list_preview">Preview</string>-->
+    <string name="font_size_message_list_preview">Förhandsvisning</string>
 
     <string name="font_size_message_view">E-post-vy</string>
     <string name="font_size_message_view_sender">Avsändare</string>
@@ -1020,11 +1023,35 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
     <string name="dialog_confirm_delete_confirm_button">Radera</string>
     <string name="dialog_confirm_delete_cancel_button">Radera inte</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">Debug-loggning till Androids loggsystem är aktiverat</string>
 
-    <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
-    <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
-    <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+    <string name="messagelist_sent_to_me_sigil">»</string>
+    <string name="messagelist_sent_cc_me_sigil">›</string>
+    <string name="error_unable_to_connect">Kan inte ansluta.</string>
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 35ef97e45..4973a8c47 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -6,9 +6,7 @@
     <!-- 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>-->
     <!-- NEW: <string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
     <string name="app_authors_fmt">作者: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">更新日志: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <!-- NEW: <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>-->
     <!-- NEW: <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>-->
 
@@ -254,6 +252,7 @@
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g>写到：\n\n</string>
     <string name="message_compose_quoted_text_label">引用文本</string>
     <string name="message_compose_error_no_recipients">您必须添加至少一个收件人。</string>
+    <!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
     <string name="message_compose_downloading_attachments_toast">一些附件没有被下载。在这个邮件发送前会自动的下载这些附件。</string>
     <string name="message_compose_attachments_skipped_toast">由于一些附件还没有被下载，因此无法转发这些附件。</string>
 
@@ -330,6 +329,7 @@
     <string name="global_settings_confirm_action_archive">归档</string>
     <string name="global_settings_confirm_action_delete">删除（仅用于邮件视图）</string>
     <string name="global_settings_confirm_action_spam">标记为垃圾</string>
+    <!-- NEW: <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>-->
     <string name="global_settings_confirm_action_send">发送</string>
 
     <string name="global_settings_privacy_mode_title">锁屏通知</string>
@@ -901,6 +901,9 @@
     <string name="count_search_title">计算搜索结果的数量</string>
     <string name="count_search_summary">关闭该功能以便加快显示速度</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="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
     <string name="flagged_modifier"> - 星标</string>
     <string name="unread_modifier"> - 未读</string>
@@ -1001,6 +1004,24 @@
     <string name="dialog_confirm_delete_confirm_button">删除</string>
     <string name="dialog_confirm_delete_cancel_button">不要删除</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>-->
+
     <!-- NEW: <string name="dialog_attachment_progress_title">Downloading attachment</string>-->
 
     <string name="debug_logging_enabled">已经启用将调试日志写入Andorid日志系统</string>
@@ -1008,4 +1029,10 @@
     <!-- NEW: <string name="messagelist_sent_to_me_sigil">»</string>-->
     <!-- NEW: <string name="messagelist_sent_cc_me_sigil">›</string>-->
     <!-- NEW: <string name="error_unable_to_connect">Unable to connect.</string>-->
+
+    <!-- NEW: <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</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>-->
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 645747228..c6409ad84 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -112,6 +112,9 @@
         <item>@string/account_settings_autodownload_message_size_512</item>
         <item>@string/account_settings_autodownload_message_size_1024</item>
         <item>@string/account_settings_autodownload_message_size_2048</item>
+        <item>@string/account_settings_autodownload_message_size_5120</item>
+        <item>@string/account_settings_autodownload_message_size_10240</item>
+        <item>@string/account_settings_autodownload_message_size_any</item>
     </string-array>
 
     <string-array name="account_settings_autodownload_message_size_values">
@@ -127,6 +130,9 @@
         <item>524288</item>
         <item>1048576</item>
         <item>2097152</item>
+        <item>5242880</item>
+        <item>10485760</item>
+        <item>0</item>
     </string-array>
 
     <string-array name="account_settings_folder_display_mode_entries">
@@ -493,6 +499,7 @@
         <item>gl</item>
         <item>it</item>
         <item>ja</item>
+        <item>hu</item>
         <item>nl</item>
         <item>pl</item>
         <item>pt_BR</item>
@@ -501,6 +508,7 @@
         <item>zh_CN</item>
         <item>fi</item>
         <item>sv</item>
+        <item>ko</item>
     </string-array>
 
     <string-array name="settings_theme_entries">
diff --git a/res/values/constants.xml b/res/values/constants.xml
new file mode 100644
index 000000000..77d07dc2b
--- /dev/null
+++ b/res/values/constants.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-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>
+</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index b144b9153..67acc95a7 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <item type="id" name="dialog_confirm_delete"/>
+    <item type="id" name="dialog_confirm_spam"/>
     <item type="id" name="dialog_attachment_progress"/>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebc0a1d02..c68dc99bd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6,9 +6,7 @@
     <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_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
-    <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_webpage_url">http://code.google.com/p/k9mail/</string>
     <string name="app_libraries">We\'re using the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_emoji_icons">Emoji icons: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
 
@@ -112,6 +110,9 @@
     <string name="view_hide_details_action">View/hide details</string>
     <string name="add_cc_bcc_action">Add Cc/Bcc</string>
     <string name="edit_subject_action">Edit subject</string>
+    <string name="read_receipt">Read receipt</string>
+    <string name="read_receipt_enabled">Read receipt will be requested</string>
+    <string name="read_receipt_disabled">Read receipt will not be requested</string>
     <string name="add_attachment_action">Add attachment</string>
     <string name="add_attachment_action_image">Add attachment (Image)</string>
     <string name="add_attachment_action_video">Add attachment (Video)</string>
@@ -267,9 +268,10 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
     <string name="message_compose_quoted_text_label">Quoted text</string>
     <string name="message_compose_error_no_recipients">You must add at least one recipient.</string>
+    <string name="error_contact_address_not_found">No email address could be found.</string>
     <string name="message_compose_downloading_attachments_toast">Some attachments were not downloaded. They will be downloaded automatically before this message is sent.</string>
     <string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not been downloaded.</string>
-
+    <string name="message_compose_show_quoted_text_action">Quote message</string>
 
 
     <string name="message_view_from_format">From: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
@@ -337,12 +339,15 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>
     <string name="global_settings_messageview_return_to_list_label">Return to list after delete</string>
     <string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</string>
+    <string name="global_settings_messageview_show_next_label">Show next message after delete</string>
+    <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>
 
     <string name="global_settings_confirm_actions_title">Confirm actions</string>
     <string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>
     <string name="global_settings_confirm_action_archive">Archive</string>
     <string name="global_settings_confirm_action_delete">Delete (message view only)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
+    <string name="global_settings_confirm_action_mark_all_as_read">Mark all as read</string>
     <string name="global_settings_confirm_action_send">Send</string>
 
     <string name="global_settings_privacy_mode_title">Lock-screen notifications</string>
@@ -562,6 +567,9 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
 
     <string name="account_settings_composition">Sending mail</string>
 
+    <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>
+    <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_reply_after_quote_label">Reply after quoted text</string>
     <string name="account_settings_reply_after_quote_summary">When replying to messages, the original message will appear above your reply.</string>
 
@@ -569,6 +577,9 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>
     <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>
 
+    <string name="account_settings_message_read_receipt_label">Read receipt</string>
+    <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>
+
     <string name="account_settings_quote_style_label">Reply quoting style</string>
     <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>
     <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>
@@ -614,6 +625,8 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="account_settings_autodownload_message_size_512">512Kb</string>
     <string name="account_settings_autodownload_message_size_1024">1Mb</string>
     <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">any size (no limit)</string>
 
     <string name="account_settings_message_age_label">Sync messages from</string>
@@ -798,6 +811,11 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
 
     <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>
 
+    <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>
+    <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>
+    <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>
+    <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="account_setup_failed_dlg_invalid_certificate_title">Unrecognized Certificate</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
@@ -921,6 +939,9 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="count_search_title">Count search results</string>
     <string name="count_search_summary">Turn off for faster display</string>
 
+    <string name="hide_special_accounts_title">Hide special accounts</string>
+    <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</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"> - Starred</string>
     <string name="unread_modifier"> - Unread</string>
@@ -1021,6 +1042,25 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="dialog_confirm_delete_confirm_button">Delete</string>
     <string name="dialog_confirm_delete_cancel_button">Do not delete</string>
 
+    <string name="dialog_confirm_spam_title">Confirm move to spam folder</string>
+    <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>
+    <string name="dialog_confirm_spam_confirm_button">Yes</string>
+    <string name="dialog_confirm_spam_cancel_button">No</string>
+
     <string name="dialog_attachment_progress_title">Downloading attachment</string>
 
     <string name="debug_logging_enabled">Debug logging to Android logging system enabled</string>
@@ -1058,4 +1098,11 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
 
     <string name="account_unavailable">Account \"<xliff:g id="account">%s</xliff:g>\" is unavailable; check storage</string>
 
+    <string name="settings_attachment_default_path">Save attachments to...</string>
+    <string name="attachment_save_title">Save attachment</string>
+    <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>
+
+    <string name="manage_accounts_move_up_action">Move up</string>
+    <string name="manage_accounts_move_down_action">Move down</string>
+    
 </resources>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 33a29ed60..467beaffd 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -232,6 +232,12 @@
             android:entries="@array/account_settings_message_format_entries"
             android:entryValues="@array/account_settings_message_format_values" />
 
+        <CheckBoxPreference
+	    android:persistent="false"
+	    android:key="message_read_receipt"
+	    android:title="@string/account_settings_message_read_receipt_label"
+	    android:summary="@string/account_settings_message_read_receipt_summary" />
+
         <ListPreference
             android:persistent="false"
             android:key="quote_style"
@@ -239,6 +245,13 @@
             android:entries="@array/account_settings_quote_style_entries"
             android:entryValues="@array/account_settings_quote_style_values" />
 
+        <CheckBoxPreference
+            android:persistent="false"
+            android:key="default_quoted_text_shown"
+            android:title="@string/account_settings_default_quoted_text_shown_label"
+            android:defaultValue="true"
+            android:summary="@string/account_settings_default_quoted_text_shown_summary" />
+
         <CheckBoxPreference
             android:persistent="false"
             android:key="reply_after_quote"
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index b58487e67..58c41afdf 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -92,6 +92,13 @@
                 android:title="@string/count_search_title"
                 android:summary="@string/count_search_summary" />
 
+            <CheckBoxPreference
+                android:persistent="false"
+                android:key="hide_special_accounts"
+                android:title="@string/hide_special_accounts_title"
+                android:summary="@string/hide_special_accounts_summary"
+                android:disableDependentsState="true" />
+
         </PreferenceCategory>
 
         <PreferenceCategory
@@ -180,7 +187,8 @@
             android:persistent="false"
             android:key="start_integrated_inbox"
             android:title="@string/start_integrated_inbox_title"
-            android:summary="@string/start_integrated_inbox_summary" />
+            android:summary="@string/start_integrated_inbox_summary"
+            android:dependency="hide_special_accounts" />
 
         <CheckBoxPreference
             android:persistent="false"
@@ -209,6 +217,12 @@
             android:title="@string/global_settings_messageview_return_to_list_label"
             android:summary="@string/global_settings_messageview_return_to_list_summary" />
 
+        <CheckBoxPreference
+            android:persistent="false"
+            android:key="messageview_show_next"
+            android:title="@string/global_settings_messageview_show_next_label"
+            android:summary="@string/global_settings_messageview_show_next_summary" />
+
         <CheckBoxPreference
             android:persistent="false"
             android:key="messageview_zoom_controls"
@@ -223,7 +237,6 @@
             android:dialogTitle="@string/global_settings_confirm_actions_title"
             android:positiveButtonText="@android:string/ok"
             android:negativeButtonText="@android:string/cancel" />
-
     </PreferenceScreen>
 
     <PreferenceScreen 
@@ -276,6 +289,11 @@
             android:title="@string/misc_preferences_attachment_title"
             android:summary="@string/misc_preferences_attachment_description" />
 
+		<Preference
+			android:persistent="false"
+			android:title="@string/settings_attachment_default_path"
+			android:key="attachment_default_path"
+			android:summary="- PATH - set by activty -"/>
     </PreferenceScreen>
 
     <PreferenceScreen
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index aed1477a0..9a7ecc794 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -276,6 +276,33 @@
         <outgoing uri="smtp://smtp.mail.yahoo.co.jp:587" username="$user" />
     </provider>
 
+   <!-- Korean -->
+    <provider id="naver" label="Naver" domain="naver.com"
+			  note="@string/provider_note_naver">
+        <incoming uri="imap+ssl://imap.naver.com"  username="$user" />
+        <outgoing uri="smtp+tls://smtp.naver.com:587" username="$user" />
+    </provider>
+    <provider id="hanmail" label="Hanmail" domain="hanmail.net"
+			  note="@string/provider_note_hanmail">
+        <incoming uri="imap+ssl://imap.hanmail.net"  username="$user" />
+        <outgoing uri="smtp+ssl://smtp.hanmail.net" username="$user" />
+    </provider>
+    <provider id="daum" label="Hanmail" domain="daum.net"
+			  note="@string/provider_note_hanmail">
+        <incoming uri="imap+ssl://imap.hanmail.net"  username="$user" />
+        <outgoing uri="smtp+ssl://smtp.hanmail.net" username="$user" />
+    </provider>
+    <provider id="paran" label="Paran" domain="paran.com"
+			  note="@string/provider_note_paran">
+        <incoming uri="imap+ssl://imap.paran.com"  username="$email" />
+        <outgoing uri="smtp+tls://smtp.paran.com" username="$email" />
+    </provider>
+    <provider id="nate" label="Nate" domain="nate.com"
+			  note="@string/provider_note_nate">
+        <incoming uri="imap+ssl://imap.nate.com"  username="$user" />
+        <outgoing uri="smtp+tls://smtp.mail.nate.com" username="$user" />
+    </provider>
+    
     <!-- Developers' vanity providers -->
     <provider id="fsck.com" label="Jesse's personal mail" domain="fsck.com" >
         <incoming uri="imap+ssl://fsck.com"  username="$user" />
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 94de6abb2..50f9d8459 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -19,6 +19,7 @@ import com.fsck.k9.mail.store.StorageManager.StorageProvider;
 import com.fsck.k9.view.ColorChip;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
@@ -34,6 +35,16 @@ import java.util.concurrent.ConcurrentHashMap;
  * and delete itself given a Preferences to work with. Each account is defined by a UUID.
  */
 public class Account implements BaseAccount {
+    /**
+     * Default value for the inbox folder (never changes for POP3 and IMAP)
+     */
+    public static final String INBOX = "INBOX";
+
+    /**
+     * This local folder is used to store messages to be sent.
+     */
+    public static final String OUTBOX = "K9MAIL_INTERNAL_OUTBOX";
+
     public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY";
     public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY";
     public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL";
@@ -49,8 +60,10 @@ public class Account implements BaseAccount {
     private static final String[] networkTypes = { TYPE_WIFI, TYPE_MOBILE, TYPE_OTHER };
 
     public static final MessageFormat DEFAULT_MESSAGE_FORMAT = MessageFormat.HTML;
+    public static final boolean DEFAULT_MESSAGE_READ_RECEIPT = false;
     public static final QuoteStyle DEFAULT_QUOTE_STYLE = QuoteStyle.PREFIX;
     public static final String DEFAULT_QUOTE_PREFIX = ">";
+    public static final boolean DEFAULT_QUOTED_TEXT_SHOWN = true;
     public static final boolean DEFAULT_REPLY_AFTER_QUOTE = false;
 
     public static final String ACCOUNT_DESCRIPTION_KEY = "description";
@@ -90,6 +103,7 @@ public class Account implements BaseAccount {
     private long mLatestOldMessageSeenTime;
     private boolean mNotifyNewMail;
     private boolean mNotifySelfNewMail;
+    private String mInboxFolderName;
     private String mDraftsFolderName;
     private String mSentFolderName;
     private String mTrashFolderName;
@@ -123,8 +137,10 @@ public class Account implements BaseAccount {
     // current set of fetched messages
     private boolean mRingNotified;
     private MessageFormat mMessageFormat;
+    private boolean mMessageReadReceipt;
     private QuoteStyle mQuoteStyle;
     private String mQuotePrefix;
+    private boolean mDefaultQuotedTextShown;
     private boolean mReplyAfterQuote;
     private boolean mSyncRemoteDeletions;
     private String mCryptoApp;
@@ -190,7 +206,8 @@ public class Account implements BaseAccount {
         mEnableMoveButtons = false;
         mIsSignatureBeforeQuotedText = false;
         mExpungePolicy = EXPUNGE_IMMEDIATELY;
-        mAutoExpandFolderName = "INBOX";
+        mAutoExpandFolderName = INBOX;
+        mInboxFolderName = INBOX;
         mMaxPushFolders = 10;
         mChipColor = (new Random()).nextInt(0xffffff) + 0xff000000;
         goToUnreadMessageSearch = false;
@@ -199,8 +216,10 @@ public class Account implements BaseAccount {
         maximumPolledMessageAge = -1;
         maximumAutoDownloadMessageSize = 32768;
         mMessageFormat = DEFAULT_MESSAGE_FORMAT;
+        mMessageReadReceipt = DEFAULT_MESSAGE_READ_RECEIPT;
         mQuoteStyle = DEFAULT_QUOTE_STYLE;
         mQuotePrefix = DEFAULT_QUOTE_PREFIX;
+        mDefaultQuotedTextShown = DEFAULT_QUOTED_TEXT_SHOWN;
         mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE;
         mSyncRemoteDeletions = true;
         mCryptoApp = Apg.NAME;
@@ -256,6 +275,7 @@ public class Account implements BaseAccount {
         mNotifySelfNewMail = prefs.getBoolean(mUuid + ".notifySelfNewMail", true);
         mNotifySync = prefs.getBoolean(mUuid + ".notifyMailCheck", false);
         mDeletePolicy = prefs.getInt(mUuid + ".deletePolicy", 0);
+        mInboxFolderName = prefs.getString(mUuid  + ".inboxFolderName", INBOX);
         mDraftsFolderName = prefs.getString(mUuid  + ".draftsFolderName", "Drafts");
         mSentFolderName = prefs.getString(mUuid  + ".sentFolderName", "Sent");
         mTrashFolderName = prefs.getString(mUuid  + ".trashFolderName", "Trash");
@@ -271,8 +291,10 @@ public class Account implements BaseAccount {
         maximumPolledMessageAge = prefs.getInt(mUuid + ".maximumPolledMessageAge", -1);
         maximumAutoDownloadMessageSize = prefs.getInt(mUuid + ".maximumAutoDownloadMessageSize", 32768);
         mMessageFormat = MessageFormat.valueOf(prefs.getString(mUuid + ".messageFormat", DEFAULT_MESSAGE_FORMAT.name()));
+        mMessageReadReceipt = prefs.getBoolean(mUuid + ".messageReadReceipt", DEFAULT_MESSAGE_READ_RECEIPT);
         mQuoteStyle = QuoteStyle.valueOf(prefs.getString(mUuid + ".quoteStyle", DEFAULT_QUOTE_STYLE.name()));
         mQuotePrefix = prefs.getString(mUuid + ".quotePrefix", DEFAULT_QUOTE_PREFIX);
+        mDefaultQuotedTextShown = prefs.getBoolean(mUuid + ".defaultQuotedTextShown", DEFAULT_QUOTED_TEXT_SHOWN);
         mReplyAfterQuote = prefs.getBoolean(mUuid + ".replyAfterQuote", DEFAULT_REPLY_AFTER_QUOTE);
         for (String type : networkTypes) {
             Boolean useCompression = prefs.getBoolean(mUuid + ".useCompression." + type,
@@ -280,8 +302,7 @@ public class Account implements BaseAccount {
             compressionMap.put(type, useCompression);
         }
 
-        mAutoExpandFolderName = prefs.getString(mUuid  + ".autoExpandFolderName",
-                                                "INBOX");
+        mAutoExpandFolderName = prefs.getString(mUuid  + ".autoExpandFolderName", INBOX);
 
         mAccountNumber = prefs.getInt(mUuid + ".accountNumber", 0);
 
@@ -367,19 +388,29 @@ public class Account implements BaseAccount {
         mCryptoAutoSignature = prefs.getBoolean(mUuid + ".cryptoAutoSignature", false);
     }
 
+    private String combineUuids(String[] uuids) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0, length = uuids.length; i < length; i++) {
+            if (sb.length() > 0) {
+                sb.append(',');
+            }
+            sb.append(uuids[i]);
+        }
+        String accountUuids = sb.toString();
+        return accountUuids;
+    }
 
     protected synchronized void delete(Preferences preferences) {
         String[] uuids = preferences.getPreferences().getString("accountUuids", "").split(",");
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0, length = uuids.length; i < length; i++) {
-            if (!uuids[i].equals(mUuid)) {
-                if (sb.length() > 0) {
-                    sb.append(',');
-                }
-                sb.append(uuids[i]);
+        String[] newUuids = new String[uuids.length - 1];
+        int i = 0;
+        for (String uuid : uuids) {
+            if (uuid.equals(mUuid) == false) {
+                newUuids[i++] = uuid;
             }
         }
-        String accountUuids = sb.toString();
+
+        String accountUuids = combineUuids(newUuids);
         SharedPreferences.Editor editor = preferences.getPreferences().edit();
         editor.putString("accountUuids", accountUuids);
 
@@ -471,6 +502,38 @@ public class Account implements BaseAccount {
         return findNewAccountNumber(accountNumbers);
     }
 
+    public void move(Preferences preferences, boolean moveUp) {
+        String[] uuids = preferences.getPreferences().getString("accountUuids", "").split(",");
+        SharedPreferences.Editor editor = preferences.getPreferences().edit();
+        String[] newUuids = new String[uuids.length];
+        if (moveUp) {
+            for (int i = 0; i < uuids.length; i++) {
+                if (i > 0 && uuids[i].equals(mUuid)) {
+                    newUuids[i] = newUuids[i-1];
+                    newUuids[i-1] = mUuid;
+                }
+                else {
+                    newUuids[i] = uuids[i];
+                }
+            }
+        }
+        else {
+            for (int i = uuids.length - 1; i >= 0; i--) {
+                if (i < uuids.length - 1 && uuids[i].equals(mUuid)) {
+                    newUuids[i] = newUuids[i+1];
+                    newUuids[i+1] = mUuid;
+                }
+                else {
+                    newUuids[i] = uuids[i];
+                }
+            }
+        }
+        String accountUuids = combineUuids(newUuids);
+        editor.putString("accountUuids", accountUuids);
+        editor.commit();
+        preferences.loadAccounts();
+    }
+
     public synchronized void save(Preferences preferences) {
         SharedPreferences.Editor editor = preferences.getPreferences().edit();
 
@@ -486,7 +549,19 @@ public class Account implements BaseAccount {
              *
              * I bet there is a much smarter way to do this. Anyone like to suggest it?
              */
-            mAccountNumber = generateAccountNumber(preferences);
+            Account[] accounts = preferences.getAccounts();
+            int[] accountNumbers = new int[accounts.length];
+            for (int i = 0; i < accounts.length; i++) {
+                accountNumbers[i] = accounts[i].getAccountNumber();
+            }
+            Arrays.sort(accountNumbers);
+            for (int accountNumber : accountNumbers) {
+                if (accountNumber > mAccountNumber + 1) {
+                    break;
+                }
+                mAccountNumber = accountNumber;
+            }
+            mAccountNumber++;
 
             String accountUuids = preferences.getPreferences().getString("accountUuids", "");
             accountUuids += (accountUuids.length() != 0 ? "," : "") + mUuid;
@@ -509,6 +584,7 @@ public class Account implements BaseAccount {
         editor.putBoolean(mUuid + ".notifySelfNewMail", mNotifySelfNewMail);
         editor.putBoolean(mUuid + ".notifyMailCheck", mNotifySync);
         editor.putInt(mUuid + ".deletePolicy", mDeletePolicy);
+        editor.putString(mUuid + ".inboxFolderName", mInboxFolderName);
         editor.putString(mUuid + ".draftsFolderName", mDraftsFolderName);
         editor.putString(mUuid + ".sentFolderName", mSentFolderName);
         editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
@@ -536,8 +612,10 @@ public class Account implements BaseAccount {
         editor.putInt(mUuid + ".maximumPolledMessageAge", maximumPolledMessageAge);
         editor.putInt(mUuid + ".maximumAutoDownloadMessageSize", maximumAutoDownloadMessageSize);
         editor.putString(mUuid + ".messageFormat", mMessageFormat.name());
+        editor.putBoolean(mUuid + ".messageReadReceipt", mMessageReadReceipt);
         editor.putString(mUuid + ".quoteStyle", mQuoteStyle.name());
         editor.putString(mUuid + ".quotePrefix", mQuotePrefix);
+        editor.putBoolean(mUuid + ".defaultQuotedTextShown", mDefaultQuotedTextShown);
         editor.putBoolean(mUuid + ".replyAfterQuote", mReplyAfterQuote);
         editor.putString(mUuid + ".cryptoApp", mCryptoApp);
         editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature);
@@ -786,7 +864,7 @@ public class Account implements BaseAccount {
 
 
     public boolean isSpecialFolder(String folderName) {
-        if (folderName != null && (folderName.equalsIgnoreCase(K9.INBOX) ||
+        if (folderName != null && (folderName.equalsIgnoreCase(getInboxFolderName()) ||
                                    folderName.equals(getTrashFolderName()) ||
                                    folderName.equals(getDraftsFolderName()) ||
                                    folderName.equals(getArchiveFolderName()) ||
@@ -848,7 +926,7 @@ public class Account implements BaseAccount {
     }
 
     public synchronized String getOutboxFolderName() {
-        return K9.OUTBOX;
+        return OUTBOX;
     }
 
     public synchronized String getAutoExpandFolderName() {
@@ -983,6 +1061,18 @@ public class Account implements BaseAccount {
         return Store.getRemoteInstance(this);
     }
 
+    // It'd be great if this actually went into the store implementation
+    // to get this, but that's expensive and not easily accessible
+    // during initialization
+    public boolean isSearchByDateCapable() {
+        if (getStoreUri().startsWith("imap")) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
     @Override
     public synchronized String toString() {
         return mDescription;
@@ -1277,6 +1367,14 @@ public class Account implements BaseAccount {
         this.mMessageFormat = messageFormat;
     }
 
+    public synchronized boolean isMessageReadReceiptAlways() {
+        return mMessageReadReceipt;
+    }
+
+    public synchronized void setMessageReadReceipt(boolean messageReadReceipt) {
+        mMessageReadReceipt = messageReadReceipt;
+    }
+
     public QuoteStyle getQuoteStyle() {
         return mQuoteStyle;
     }
@@ -1293,6 +1391,14 @@ public class Account implements BaseAccount {
         mQuotePrefix = quotePrefix;
     }
 
+    public synchronized boolean isDefaultQuotedTextShown() {
+        return mDefaultQuotedTextShown;
+    }
+
+    public synchronized void setDefaultQuotedTextShown(boolean shown) {
+        mDefaultQuotedTextShown = shown;
+    }
+
     public synchronized boolean isReplyAfterQuote() {
         return mReplyAfterQuote;
     }
@@ -1326,6 +1432,15 @@ public class Account implements BaseAccount {
     public void setCryptoAutoSignature(boolean cryptoAutoSignature) {
         mCryptoAutoSignature = cryptoAutoSignature;
     }
+
+    public String getInboxFolderName() {
+        return mInboxFolderName;
+    }
+
+    public void setInboxFolderName(String mInboxFolderName) {
+        this.mInboxFolderName = mInboxFolderName;
+    }
+
     public synchronized boolean syncRemoteDeletions() {
         return mSyncRemoteDeletions;
     }
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index b23aec55d..80e06b463 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -2,6 +2,7 @@
 package com.fsck.k9;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +19,11 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.format.Time;
+import android.text.style.AbsoluteSizeSpan;
 import android.util.Log;
 
 import com.fsck.k9.activity.MessageCompose;
@@ -65,6 +68,10 @@ public class K9 extends Application {
      */
     private static List<ApplicationAware> observers = new ArrayList<ApplicationAware>();
 
+    /**
+     * @see K9#createAbsoluteSizeSpan(int)
+     */
+    private static Constructor<AbsoluteSizeSpan> sAbsoluteSizeSpanConstructor;
 
     public enum BACKGROUND_OPS {
         WHEN_CHECKED, ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC
@@ -143,10 +150,11 @@ public class K9 extends Application {
     public static boolean ENABLE_ERROR_FOLDER = true;
     public static String ERROR_FOLDER_NAME = "K9mail-errors";
 
-
     private static boolean mAnimations = true;
 
     private static boolean mConfirmDelete = false;
+    private static boolean mConfirmSpam = false;
+    private static boolean mConfirmMarkAllAsRead = true;
     private static boolean mKeyguardPrivacy = false;
 
     private static boolean mMessageListStars = true;
@@ -160,6 +168,7 @@ public class K9 extends Application {
     private static int mContactNameColor = 0xff00008f;
     private static boolean mMessageViewFixedWidthFont = false;
     private static boolean mMessageViewReturnToList = false;
+    private static boolean mMessageViewShowNext = false;
 
     private static boolean mGesturesEnabled = true;
     private static boolean mUseVolumeKeysForNavigation = false;
@@ -168,13 +177,14 @@ public class K9 extends Application {
     private static boolean mStartIntegratedInbox = false;
     private static boolean mMeasureAccounts = true;
     private static boolean mCountSearchMessages = true;
+    private static boolean mHideSpecialAccounts = false;
     private static boolean mZoomControlsEnabled = false;
     private static boolean mMobileOptimizedLayout = false;
     private static boolean mQuietTimeEnabled = false;
     private static String mQuietTimeStarts = null;
     private static String mQuietTimeEnds = null;
     private static boolean compactLayouts = false;
-
+    private static String mAttachmentDefaultPath = "";
 
 
     private static boolean useGalleryBugWorkaround = false;
@@ -207,17 +217,6 @@ public class K9 extends Application {
     public static final String[] UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES = new String[] {
     };
 
-    /**
-     * The special name "INBOX" is used throughout the application to mean "Whatever folder
-     * the server refers to as the user's Inbox. Placed here to ease use.
-     */
-    public static final String INBOX = "INBOX";
-
-    /**
-     * This local folder is used to store messages to be sent.
-     */
-    public static final String OUTBOX = "OUTBOX";
-
     /**
      * For use when displaying that no folder is selected
      */
@@ -244,6 +243,13 @@ public class K9 extends Application {
      */
     public static final int MAX_ATTACHMENT_DOWNLOAD_SIZE = (128 * 1024 * 1024);
 
+
+    /* How many times should K-9 try to deliver a message before giving up
+     * until the app is killed and restarted
+     */
+
+    public static int MAX_SEND_ATTEMPTS = 5;
+
     /**
      * Max time (in millis) the wake lock will be held for when background sync is happening
      */
@@ -418,6 +424,7 @@ public class K9 extends Application {
         editor.putBoolean("startIntegratedInbox", mStartIntegratedInbox);
         editor.putBoolean("measureAccounts", mMeasureAccounts);
         editor.putBoolean("countSearchMessages", mCountSearchMessages);
+        editor.putBoolean("hideSpecialAccounts", mHideSpecialAccounts);
         editor.putBoolean("messageListStars", mMessageListStars);
         editor.putBoolean("messageListCheckboxes", mMessageListCheckboxes);
         editor.putBoolean("messageListTouchable", mMessageListTouchable);
@@ -429,72 +436,23 @@ public class K9 extends Application {
         editor.putInt("registeredNameColor", mContactNameColor);
         editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont);
         editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList);
+        editor.putBoolean("messageViewShowNext", mMessageViewShowNext);
 
         editor.putString("language", language);
         editor.putInt("theme", theme);
         editor.putBoolean("useGalleryBugWorkaround", useGalleryBugWorkaround);
 
         editor.putBoolean("confirmDelete", mConfirmDelete);
+        editor.putBoolean("confirmSpam", mConfirmSpam);
+        editor.putBoolean("confirmMarkAllAsRead", mConfirmMarkAllAsRead);
 
         editor.putBoolean("keyguardPrivacy", mKeyguardPrivacy);
 
         editor.putBoolean("compactLayouts", compactLayouts);
-
+        editor.putString("attachmentdefaultpath", mAttachmentDefaultPath);
         fontSizes.save(editor);
     }
 
-    public static void loadPrefs(Preferences prefs) {
-        SharedPreferences sprefs = prefs.getPreferences();
-
-        DEBUG = sprefs.getBoolean("enableDebugLogging", false);
-        DEBUG_SENSITIVE = sprefs.getBoolean("enableSensitiveLogging", false);
-        mAnimations = sprefs.getBoolean("animations", true);
-        mGesturesEnabled = sprefs.getBoolean("gesturesEnabled", true);
-        mUseVolumeKeysForNavigation = sprefs.getBoolean("useVolumeKeysForNavigation", false);
-        mUseVolumeKeysForListNavigation = sprefs.getBoolean("useVolumeKeysForListNavigation", false);
-        mManageBack = sprefs.getBoolean("manageBack", false);
-        mStartIntegratedInbox = sprefs.getBoolean("startIntegratedInbox", false);
-        mMeasureAccounts = sprefs.getBoolean("measureAccounts", true);
-        mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
-        mMessageListStars = sprefs.getBoolean("messageListStars", true);
-        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", false);
-        mMessageListTouchable = sprefs.getBoolean("messageListTouchable", false);
-        mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
-
-        mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
-        mZoomControlsEnabled = sprefs.getBoolean("zoomControlsEnabled", false);
-
-        mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
-        mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00");
-        mQuietTimeEnds = sprefs.getString("quietTimeEnds", "7:00");
-
-        mShowCorrespondentNames = sprefs.getBoolean("showCorrespondentNames", true);
-        mShowContactName = sprefs.getBoolean("showContactName", false);
-        mChangeContactNameColor = sprefs.getBoolean("changeRegisteredNameColor", false);
-        mContactNameColor = sprefs.getInt("registeredNameColor", 0xff00008f);
-        mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
-        mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
-
-        useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy());
-
-        mConfirmDelete = sprefs.getBoolean("confirmDelete", false);
-
-        mKeyguardPrivacy = sprefs.getBoolean("keyguardPrivacy", false);
-
-        compactLayouts = sprefs.getBoolean("compactLayouts", false);
-
-        fontSizes.load(sprefs);
-
-        try {
-            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString("backgroundOperations", "WHEN_CHECKED")));
-        } catch (Exception e) {
-            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED);
-        }
-
-        K9.setK9Language(sprefs.getString("language", ""));
-        K9.setK9Theme(sprefs.getInt("theme", android.R.style.Theme_Light));
-    }
-
     @Override
     public void onCreate() {
         maybeSetupStrictMode();
@@ -504,7 +462,9 @@ public class K9 extends Application {
 
         galleryBuggy = checkForBuggyGallery();
 
-        loadPrefs(Preferences.getPreferences(this));
+        Preferences prefs = Preferences.getPreferences(this);
+        loadPrefs(prefs);
+
         /*
          * We have to give MimeMessage a temp directory because File.createTempFile(String, String)
          * doesn't work in Android and MimeMessage does not have access to a Context.
@@ -566,7 +526,7 @@ public class K9 extends Application {
 
             @Override
             public void searchStats(final AccountStats stats) {
-                // let observers know a fetch occured
+                // let observers know a fetch occurred
                 K9.this.sendBroadcast(new Intent(K9.Intents.EmailReceived.ACTION_REFRESH_OBSERVER, null));
             }
 
@@ -575,6 +535,62 @@ public class K9 extends Application {
         notifyObservers();
     }
 
+    public static void loadPrefs(Preferences prefs) {
+        SharedPreferences sprefs = prefs.getPreferences();
+        DEBUG = sprefs.getBoolean("enableDebugLogging", false);
+        DEBUG_SENSITIVE = sprefs.getBoolean("enableSensitiveLogging", false);
+        mAnimations = sprefs.getBoolean("animations", true);
+        mGesturesEnabled = sprefs.getBoolean("gesturesEnabled", true);
+        mUseVolumeKeysForNavigation = sprefs.getBoolean("useVolumeKeysForNavigation", false);
+        mUseVolumeKeysForListNavigation = sprefs.getBoolean("useVolumeKeysForListNavigation", false);
+        mManageBack = sprefs.getBoolean("manageBack", false);
+        mStartIntegratedInbox = sprefs.getBoolean("startIntegratedInbox", false);
+        mMeasureAccounts = sprefs.getBoolean("measureAccounts", true);
+        mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
+        mHideSpecialAccounts = sprefs.getBoolean("hideSpecialAccounts", false);
+        mMessageListStars = sprefs.getBoolean("messageListStars", true);
+        mMessageListCheckboxes = sprefs.getBoolean("messageListCheckboxes", false);
+        mMessageListTouchable = sprefs.getBoolean("messageListTouchable", false);
+        mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
+
+        mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
+        mZoomControlsEnabled = sprefs.getBoolean("zoomControlsEnabled", false);
+
+        mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
+        mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00");
+        mQuietTimeEnds = sprefs.getString("quietTimeEnds", "7:00");
+
+        mShowCorrespondentNames = sprefs.getBoolean("showCorrespondentNames", true);
+        mShowContactName = sprefs.getBoolean("showContactName", false);
+        mChangeContactNameColor = sprefs.getBoolean("changeRegisteredNameColor", false);
+        mContactNameColor = sprefs.getInt("registeredNameColor", 0xff00008f);
+        mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
+        mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
+        mMessageViewShowNext = sprefs.getBoolean("messageViewShowNext", false);
+
+        useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy());
+
+        mConfirmDelete = sprefs.getBoolean("confirmDelete", false);
+        mConfirmSpam = sprefs.getBoolean("confirmSpam", false);
+        mConfirmMarkAllAsRead = sprefs.getBoolean("confirmMarkAllAsRead", true);
+
+
+        mKeyguardPrivacy = sprefs.getBoolean("keyguardPrivacy", false);
+
+        compactLayouts = sprefs.getBoolean("compactLayouts", false);
+        mAttachmentDefaultPath = sprefs.getString("attachmentdefaultpath",  Environment.getExternalStorageDirectory().toString());
+        fontSizes.load(sprefs);
+
+        try {
+            setBackgroundOps(BACKGROUND_OPS.valueOf(sprefs.getString("backgroundOperations", "WHEN_CHECKED")));
+        } catch (Exception e) {
+            setBackgroundOps(BACKGROUND_OPS.WHEN_CHECKED);
+        }
+
+        K9.setK9Language(sprefs.getString("language", ""));
+        K9.setK9Theme(sprefs.getInt("theme", android.R.style.Theme_Light));
+    }
+
     private void maybeSetupStrictMode() {
         if (!K9.DEVELOPER_MODE)
             return;
@@ -866,6 +882,14 @@ public class K9 extends Application {
         mMessageViewReturnToList = messageViewReturnToList;
     }
 
+    public static boolean messageViewShowNext() {
+        return mMessageViewShowNext;
+    }
+
+    public static void setMessageViewShowNext(boolean messageViewShowNext) {
+        mMessageViewShowNext = messageViewShowNext;
+    }
+
     public static Method getMethod(Class<?> classObject, String methodName) {
         try {
             return classObject.getMethod(methodName, boolean.class);
@@ -899,6 +923,14 @@ public class K9 extends Application {
         mCountSearchMessages = countSearchMessages;
     }
 
+    public static boolean isHideSpecialAccounts() {
+        return mHideSpecialAccounts;
+    }
+
+    public static void setHideSpecialAccounts(boolean hideSpecialAccounts) {
+        mHideSpecialAccounts = hideSpecialAccounts;
+    }
+
     public static boolean useGalleryBugWorkaround() {
         return useGalleryBugWorkaround;
     }
@@ -919,6 +951,22 @@ public class K9 extends Application {
         mConfirmDelete = confirm;
     }
 
+    public static boolean confirmSpam() {
+        return mConfirmSpam;
+    }
+
+    public static void setConfirmSpam(final boolean confirm) {
+        mConfirmSpam = confirm;
+    }
+
+    public static boolean confirmMarkAllAsRead() {
+        return mConfirmMarkAllAsRead;
+    }
+
+    public static void setConfirmMarkAllAsRead(final boolean confirm) {
+        mConfirmMarkAllAsRead = confirm;
+    }
+
     /**
      * @return Whether privacy rules should be applied when system is locked
      */
@@ -957,4 +1005,55 @@ public class K9 extends Application {
         }
     }
 
+    public static String getAttachmentDefaultPath() {
+        return mAttachmentDefaultPath;
+    }
+
+    public static void setAttachmentDefaultPath(String attachmentDefaultPath) {
+        K9.mAttachmentDefaultPath = attachmentDefaultPath;
+    }
+
+    /**
+     * Creates an {@link AbsoluteSizeSpan} object.
+     *
+     * <p>
+     * Android versions prior to 2.0 don't support the constructor with two parameters
+     * ({@link AbsoluteSizeSpan#AbsoluteSizeSpan(int, boolean)}). So we have to perform some
+     * reflection magic to dynamically load the new constructor on devices that support it.
+     * For devices with old Android versions we just use the size as pixels (instead of dip).
+     * </p>
+     *
+     * @param size This is used as the {@code size} parameter for the AbsoluteSizeSpan constructor.
+     * @return a AbsoluteSizeSpan object with the specified text size.
+     */
+    public static AbsoluteSizeSpan createAbsoluteSizeSpan(int size) {
+        if (Integer.parseInt(android.os.Build.VERSION.SDK) < 5) {
+            // For Android 1.5/1.6 simply use the constructor with only the size parameter.
+            // Yes, that will most likely look wrong!
+            return new AbsoluteSizeSpan(size);
+        }
+
+        if (sAbsoluteSizeSpanConstructor == null) {
+            try {
+                sAbsoluteSizeSpanConstructor = AbsoluteSizeSpan.class.getConstructor(int.class, boolean.class);
+            } catch (Exception e) {
+                Log.e(K9.LOG_TAG, "Couldn't get the AbsoluteSizeSpan(int, boolean) constructor", e);
+
+                // Fallback
+                return new AbsoluteSizeSpan(size);
+            }
+        }
+
+        AbsoluteSizeSpan result;
+        try {
+            result = sAbsoluteSizeSpanConstructor.newInstance(size, true);
+        } catch (Exception e) {
+            Log.e(K9.LOG_TAG, "Couldn't call the AbsoluteSizeSpan(int, boolean) constructor", e);
+
+            // Fallback
+            result = new AbsoluteSizeSpan(size);
+        }
+
+        return result;
+    }
 }
diff --git a/src/com/fsck/k9/Preferences.java b/src/com/fsck/k9/Preferences.java
index 462d37e63..460dcb4ae 100644
--- a/src/com/fsck/k9/Preferences.java
+++ b/src/com/fsck/k9/Preferences.java
@@ -116,8 +116,13 @@ public class Preferences {
     }
 
     public synchronized void deleteAccount(Account account) {
-        accounts.remove(account.getUuid());
-        accountsInOrder.remove(account);
+    	if (accounts != null) {
+    		accounts.remove(account.getUuid());
+    	}
+    	if (accountsInOrder != null) {
+    		accountsInOrder.remove(account);	
+    	}
+
         account.delete(this);
 
         if (newAccount == account) {
diff --git a/src/com/fsck/k9/SearchAccount.java b/src/com/fsck/k9/SearchAccount.java
index 79161061d..b990e8d09 100644
--- a/src/com/fsck/k9/SearchAccount.java
+++ b/src/com/fsck/k9/SearchAccount.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package com.fsck.k9;
 
 import java.io.Serializable;
@@ -10,6 +7,10 @@ import android.content.Context;
 
 import com.fsck.k9.mail.Flag;
 
+/**
+ * This is a meta-Account that represents one or more accounts with filters on them.  The filter specification
+ * is defined by {@link com.fsck.k9.activity.SearchModifier}.
+ */
 public class SearchAccount implements BaseAccount, SearchSpecification, Serializable {
     private static final long serialVersionUID = -4388420303235543976L;
     private Flag[] mRequiredFlags = null;
@@ -24,17 +25,14 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     private String[] folderNames = null;
 
     public SearchAccount(Preferences preferences) {
-
     }
-    protected synchronized void delete(Preferences preferences) {
 
+    protected synchronized void delete(Preferences preferences) {
     }
 
     public synchronized void save(Preferences preferences) {
-
     }
 
-
     public SearchAccount(Context context, boolean nintegrate, Flag[] requiredFlags, Flag[] forbiddenFlags) {
         mRequiredFlags = requiredFlags;
         mForbiddenFlags = forbiddenFlags;
@@ -78,12 +76,14 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     public void setQuery(String query) {
         this.query = query;
     }
+
     public String getUuid() {
         if (mUuid == null) {
             setUuid(UUID.randomUUID().toString());
         }
         return mUuid;
     }
+
     public void setUuid(String nUuid) {
         mUuid = nUuid;
     }
@@ -99,16 +99,20 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     public void setBuiltin(boolean builtin) {
         this.builtin = builtin;
     }
+
     public String[] getAccountUuids() {
         return accountUuids;
     }
+
     public void setAccountUuids(String[] accountUuids) {
         this.accountUuids = accountUuids;
     }
+
     @Override
     public String[] getFolderNames() {
         return folderNames;
     }
+
     public void setFolderNames(String[] folderNames) {
         this.folderNames = folderNames;
     }
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 50cf27e8a..0f951e7d8 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -310,20 +311,22 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        unreadAccount = new SearchAccount(this, false, null, null);
-        unreadAccount.setDescription(getString(R.string.search_all_messages_title));
-        unreadAccount.setEmail(getString(R.string.search_all_messages_detail));
+        if (!K9.isHideSpecialAccounts()) {
+            unreadAccount = new SearchAccount(this, false, null, null);
+            unreadAccount.setDescription(getString(R.string.search_all_messages_title));
+            unreadAccount.setEmail(getString(R.string.search_all_messages_detail));
 
-        integratedInboxAccount = new SearchAccount(this, true, null,  null);
-        integratedInboxAccount.setDescription(getString(R.string.integrated_inbox_title));
-        integratedInboxAccount.setEmail(getString(R.string.integrated_inbox_detail));
+            integratedInboxAccount = new SearchAccount(this, true, null,  null);
+            integratedInboxAccount.setDescription(getString(R.string.integrated_inbox_title));
+            integratedInboxAccount.setEmail(getString(R.string.integrated_inbox_detail));
+        }
 
         Account[] accounts = Preferences.getPreferences(this).getAccounts();
         Intent intent = getIntent();
-        boolean startup = intent.getData() == null && intent.getBooleanExtra(EXTRA_STARTUP, true);
-        onNewIntent(intent);
+        //onNewIntent(intent);
 
-        if (startup && K9.startIntegratedInbox()) {
+        boolean startup = intent.getBooleanExtra(EXTRA_STARTUP, true);
+        if (startup && K9.startIntegratedInbox() && !K9.isHideSpecialAccounts()) {
             onOpenAccount(integratedInboxAccount);
             finish();
             return;
@@ -340,6 +343,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         listView.setOnItemClickListener(this);
         listView.setItemsCanFocus(false);
         listView.setEmptyView(findViewById(R.id.empty));
+        listView.setScrollingCacheEnabled(false);
         findViewById(R.id.next).setOnClickListener(this);
         registerForContextMenu(listView);
 
@@ -403,7 +407,6 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         super.onPause();
         MessagingController.getInstance(getApplication()).removeListener(mListener);
         StorageManager.getInstance(getApplication()).removeListener(storageListener);
-
     }
 
     /**
@@ -418,13 +421,37 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         return retain;
     }
 
-    private void refresh() {
-        BaseAccount[] accounts = Preferences.getPreferences(this).getAccounts();
-
-        List<BaseAccount> newAccounts = new ArrayList<BaseAccount>(accounts.length + 4);
+    private BaseAccount[] accounts = new BaseAccount[0];
+    private enum ACCOUNT_LOCATION {
+        TOP, MIDDLE, BOTTOM;
+    }
+    private EnumSet<ACCOUNT_LOCATION> accountLocation(BaseAccount account) {
+        EnumSet<ACCOUNT_LOCATION> accountLocation = EnumSet.of(ACCOUNT_LOCATION.MIDDLE);
         if (accounts.length > 0) {
+            if (accounts[0].equals(account)) {
+                accountLocation.remove(ACCOUNT_LOCATION.MIDDLE);
+                accountLocation.add(ACCOUNT_LOCATION.TOP);
+            }
+            if (accounts[accounts.length - 1].equals(account)) {
+                accountLocation.remove(ACCOUNT_LOCATION.MIDDLE);
+                accountLocation.add(ACCOUNT_LOCATION.BOTTOM);
+            }
+        }
+        return accountLocation;
+    }
+
+
+    private void refresh() {
+        accounts = Preferences.getPreferences(this).getAccounts();
+
+        List<BaseAccount> newAccounts;
+        if (!K9.isHideSpecialAccounts()
+                && accounts.length > 0) {
+            newAccounts = new ArrayList<BaseAccount>(accounts.length + 2);
             newAccounts.add(integratedInboxAccount);
             newAccounts.add(unreadAccount);
+        } else {
+            newAccounts = new ArrayList<BaseAccount>(accounts.length);
         }
 
         newAccounts.addAll(Arrays.asList(accounts));
@@ -547,11 +574,67 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     public Dialog onCreateDialog(int id) {
         switch (id) {
         case DIALOG_REMOVE_ACCOUNT:
-            return createRemoveAccountDialog();
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_delete_dlg_title,
+                                             getString(R.string.account_delete_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account)mSelectedContextAccount;
+                        try {
+                            realAccount.getLocalStore().delete();
+                        } catch (Exception e) {
+                            // Ignore, this may lead to localStores on sd-cards that are
+                            // currently not inserted to be left
+                        }
+                        MessagingController.getInstance(getApplication())
+                        .notifyAccountCancel(Accounts.this, realAccount);
+                        Preferences.getPreferences(Accounts.this).deleteAccount(realAccount);
+                        K9.setServicesEnabled(Accounts.this);
+                        refresh();
+                    }
+                }
+            });
+
         case DIALOG_CLEAR_ACCOUNT:
-            return createClearAccountDialog();
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_clear_dlg_title,
+                                             getString(R.string.account_clear_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account)mSelectedContextAccount;
+                        mHandler.workingAccount(realAccount, R.string.clearing_account);
+                        MessagingController.getInstance(getApplication()).clear(realAccount, null);
+                    }
+                }
+            });
+
         case DIALOG_RECREATE_ACCOUNT:
-            return createRecreateAccountDialog();
+            return ConfirmationDialog.create(this, id,
+                                             R.string.account_recreate_dlg_title,
+                                             getString(R.string.account_recreate_dlg_instructions_fmt,
+                                                     mSelectedContextAccount.getDescription()),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    if (mSelectedContextAccount instanceof Account) {
+                        Account realAccount = (Account)mSelectedContextAccount;
+                        mHandler.workingAccount(realAccount, R.string.recreating_account);
+                        MessagingController.getInstance(getApplication()).recreate(realAccount, null);
+                    }
+                }
+            });
         }
         return super.onCreateDialog(id);
     }
@@ -578,89 +661,6 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         super.onPrepareDialog(id, d);
     }
 
-
-    private Dialog createRemoveAccountDialog() {
-        return new AlertDialog.Builder(this)
-               .setTitle(R.string.account_delete_dlg_title)
-               .setMessage(getString(R.string.account_delete_dlg_instructions_fmt, mSelectedContextAccount.getDescription()))
-        .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_REMOVE_ACCOUNT);
-                removeDialog(DIALOG_REMOVE_ACCOUNT);
-
-                if (mSelectedContextAccount instanceof Account) {
-                    Account realAccount = (Account)mSelectedContextAccount;
-                    try {
-                        realAccount.getLocalStore().delete();
-                    } catch (Exception e) {
-                        // Ignore, this may lead to localStores on sd-cards that are currently not inserted to be left
-                    }
-                    MessagingController.getInstance(getApplication()).notifyAccountCancel(Accounts.this, realAccount);
-                    Preferences.getPreferences(Accounts.this).deleteAccount(realAccount);
-                    K9.setServicesEnabled(Accounts.this);
-                    refresh();
-                }
-            }
-        })
-        .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_REMOVE_ACCOUNT);
-                removeDialog(DIALOG_REMOVE_ACCOUNT);
-            }
-        })
-               .create();
-    }
-
-    private Dialog createClearAccountDialog() {
-        return new AlertDialog.Builder(this)
-               .setTitle(R.string.account_clear_dlg_title)
-               .setMessage(getString(R.string.account_clear_dlg_instructions_fmt, mSelectedContextAccount.getDescription()))
-        .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_CLEAR_ACCOUNT);
-                removeDialog(DIALOG_CLEAR_ACCOUNT);
-
-                if (mSelectedContextAccount instanceof Account) {
-                    Account realAccount = (Account)mSelectedContextAccount;
-                    mHandler.workingAccount(realAccount, R.string.clearing_account);
-                    MessagingController.getInstance(getApplication()).clear(realAccount, null);
-                }
-            }
-        })
-        .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_CLEAR_ACCOUNT);
-                removeDialog(DIALOG_CLEAR_ACCOUNT);
-            }
-        })
-               .create();
-    }
-
-    private Dialog createRecreateAccountDialog() {
-        return new AlertDialog.Builder(this)
-               .setTitle(R.string.account_recreate_dlg_title)
-               .setMessage(getString(R.string.account_recreate_dlg_instructions_fmt, mSelectedContextAccount.getDescription()))
-        .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_RECREATE_ACCOUNT);
-                removeDialog(DIALOG_RECREATE_ACCOUNT);
-
-                if (mSelectedContextAccount instanceof Account) {
-                    Account realAccount = (Account)mSelectedContextAccount;
-                    mHandler.workingAccount(realAccount, R.string.recreating_account);
-                    MessagingController.getInstance(getApplication()).recreate(realAccount, null);
-                }
-            }
-        })
-        .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_RECREATE_ACCOUNT);
-                removeDialog(DIALOG_RECREATE_ACCOUNT);
-            }
-        })
-               .create();
-    }
-
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo menuInfo = (AdapterContextMenuInfo)item.getMenuInfo();
@@ -704,6 +704,12 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         case R.id.export:
             onExport(false, realAccount);
             break;
+        case R.id.move_up:
+            onMove(realAccount, true);
+            break;
+        case R.id.move_down:
+            onMove(realAccount, false);
+            break;
         }
         return true;
     }
@@ -722,7 +728,11 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
     private void onRecreate(Account account) {
         showDialog(DIALOG_RECREATE_ACCOUNT);
     }
-
+    private void onMove(final Account account, final boolean up) {
+        MoveAccountAsyncTask asyncTask = new MoveAccountAsyncTask(this, account, up);
+        setNonConfigurationInstance(asyncTask);
+        asyncTask.execute();
+    }
 
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         BaseAccount account = (BaseAccount)parent.getItemAtPosition(position);
@@ -801,7 +811,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
         StringBuilder libs = new StringBuilder().append("<ul>");
         for (String[] library : USED_LIBRARIES) {
-            libs.append("<li><a href=\"" + library[1] + "\">" + library[0] + "</a></li>");
+            libs.append("<li><a href=\"").append(library[1]).append("\">").append(library[0]).append("</a></li>");
         }
         libs.append("</ul>");
 
@@ -868,6 +878,21 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 }
             }
         }
+        else {
+            EnumSet<ACCOUNT_LOCATION> accountLocation = accountLocation(account);
+            if (accountLocation.contains(ACCOUNT_LOCATION.TOP)) {
+                menu.findItem(R.id.move_up).setEnabled(false);
+            }
+            else {
+                menu.findItem(R.id.move_up).setEnabled(true);
+            }
+            if (accountLocation.contains(ACCOUNT_LOCATION.BOTTOM)) {
+                menu.findItem(R.id.move_down).setEnabled(false);
+            }
+            else {
+                menu.findItem(R.id.move_down).setEnabled(true);
+            }
+        }
     }
 
     private void onImport() {
@@ -1494,4 +1519,40 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             }
         }
     }
+
+    private static class MoveAccountAsyncTask extends ExtendedAsyncTask<Void, Void, Void> {
+        private Account mAccount;
+        private boolean mUp;
+
+        protected MoveAccountAsyncTask(Activity activity, Account account, boolean up) {
+            super(activity);
+            mAccount = account;
+            mUp = up;
+        }
+
+        @Override
+        protected void showProgressDialog() {
+            //FIXME
+            String title = "";
+            String message = "";
+            mProgressDialog = ProgressDialog.show(mActivity, title, message, true);
+        }
+
+        @Override
+        protected Void doInBackground(Void... args) {
+            mAccount.move(Preferences.getPreferences(mContext), mUp);
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void arg) {
+            Accounts activity = (Accounts) mActivity;
+
+            // Let the activity know that the background task is complete
+            activity.setNonConfigurationInstance(null);
+
+            activity.refresh();
+            removeProgressDialog();
+        }
+    }
 }
diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/src/com/fsck/k9/activity/ActivityListener.java
index 9647e3352..803158fc0 100644
--- a/src/com/fsck/k9/activity/ActivityListener.java
+++ b/src/com/fsck/k9/activity/ActivityListener.java
@@ -6,7 +6,6 @@ import android.content.Context;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.AccountStats;
-import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.service.MailService;
@@ -35,7 +34,7 @@ public class ActivityListener extends MessagingListener {
 
             if (mLoadingFolderName != null || mLoadingHeaderFolderName != null) {
                 String displayName = mLoadingFolderName;
-                if (K9.INBOX.equalsIgnoreCase(displayName)) {
+                if ((mAccount != null) && (mAccount.getInboxFolderName() != null) && mAccount.getInboxFolderName().equalsIgnoreCase(displayName)) {
                     displayName = context.getString(R.string.special_mailbox_name_inbox);
                 } else if ((mAccount != null) && mAccount.getOutboxFolderName().equals(displayName)) {
                     displayName = context.getString(R.string.special_mailbox_name_outbox);
@@ -203,6 +202,7 @@ public class ActivityListener extends MessagingListener {
         return mFolderCompleted;
     }
 
+
     public int getFolderTotal() {
         return mFolderTotal;
     }
diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java
index 01513196f..2003d7f7d 100644
--- a/src/com/fsck/k9/activity/ChooseFolder.java
+++ b/src/com/fsck/k9/activity/ChooseFolder.java
@@ -100,6 +100,7 @@ public class ChooseFolder extends K9ListActivity {
         setListAdapter(mAdapter);
 
 
+        mMode = mAccount.getFolderTargetMode();
         MessagingController.getInstance(getApplication()).listFolders(mAccount, false, mListener);
 
 
@@ -248,7 +249,8 @@ public class ChooseFolder extends K9ListActivity {
                 String name = folder.getName();
 
                 // Inbox needs to be compared case-insensitively
-                if (hideCurrentFolder && (name.equals(mFolder) || (K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name)))) {
+                if (hideCurrentFolder && (name.equals(mFolder) ||
+                (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) {
                     continue;
                 }
                 try {
@@ -282,10 +284,10 @@ public class ChooseFolder extends K9ListActivity {
                     if (K9.FOLDER_NONE.equalsIgnoreCase(bName)) {
                         return 1;
                     }
-                    if (K9.INBOX.equalsIgnoreCase(aName)) {
+                    if (mAccount.getInboxFolderName().equalsIgnoreCase(aName)) {
                         return -1;
                     }
-                    if (K9.INBOX.equalsIgnoreCase(bName)) {
+                    if (mAccount.getInboxFolderName().equalsIgnoreCase(bName)) {
                         return 1;
                     }
 
@@ -298,7 +300,7 @@ public class ChooseFolder extends K9ListActivity {
                 mAdapter.clear();
                 int position = 0;
                 for (String name : localFolders) {
-                    if (K9.INBOX.equalsIgnoreCase(name)) {
+                    if (mAccount.getInboxFolderName().equalsIgnoreCase(name)) {
                         mAdapter.add(getString(R.string.special_mailbox_name_inbox));
                         heldInbox = name;
                     } else if (!K9.ERROR_FOLDER_NAME.equals(name) && !account.getOutboxFolderName().equals(name)) {
@@ -315,7 +317,7 @@ public class ChooseFolder extends K9ListActivity {
                             selectedFolder = position;
                         }
                     } else if (name.equals(mFolder) ||
-                    (K9.INBOX.equalsIgnoreCase(mFolder) && K9.INBOX.equalsIgnoreCase(name))) {
+                    (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name))) {
                         selectedFolder = position;
                     }
                     position++;
diff --git a/src/com/fsck/k9/activity/ConfirmationDialog.java b/src/com/fsck/k9/activity/ConfirmationDialog.java
new file mode 100644
index 000000000..246ab2f5d
--- /dev/null
+++ b/src/com/fsck/k9/activity/ConfirmationDialog.java
@@ -0,0 +1,90 @@
+package com.fsck.k9.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+
+public class ConfirmationDialog {
+
+    /**
+     * Creates a customized confirmation dialog ({@link AlertDialog}).
+     *
+     * @param activity The activity this dialog is created for.
+     * @param dialogId The id that was used with {@link Activity#showDialog(int)}
+     * @param title The resource id of the text to display in the dialog title
+     * @param message The text to display in the main dialog area
+     * @param confirmButton The resource id of the text to display in the confirm button
+     * @param cancelButton The resource id of the text to display in the cancel button
+     * @param action The action to perform if the user presses the confirm button
+     * @return A confirmation dialog with the supplied arguments
+     */
+    public static Dialog create(final Activity activity, final int dialogId, final int title,
+                                final String message, final int confirmButton, final int cancelButton,
+                                final Runnable action) {
+        return create(activity, dialogId, title, message, confirmButton, cancelButton,
+                      action, null);
+    }
+
+    /**
+     * Creates a customized confirmation dialog ({@link AlertDialog}).
+     *
+     * @param activity The activity this dialog is created for.
+     * @param dialogId The id that was used with {@link Activity#showDialog(int)}
+     * @param title The resource id of the text to display in the dialog title
+     * @param message The text to display in the main dialog area
+     * @param confirmButton The resource id of the text to display in the confirm button
+     * @param cancelButton The resource id of the text to display in the cancel button
+     * @param action The action to perform if the user presses the confirm button
+     * @param negativeAction The action to perform if the user presses the cancel button. Can be {@code null}.
+     * @return A confirmation dialog with the supplied arguments
+     */
+    public static Dialog create(final Activity activity, final int dialogId, final int title,
+                                final String message, final int confirmButton, final int cancelButton,
+                                final Runnable action, final Runnable negativeAction) {
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setTitle(title);
+        builder.setMessage(message);
+        builder.setPositiveButton(confirmButton,
+        new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                activity.dismissDialog(dialogId);
+                action.run();
+            }
+        });
+        builder.setNegativeButton(cancelButton,
+        new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                activity.dismissDialog(dialogId);
+                if (negativeAction != null) {
+                    negativeAction.run();
+                }
+            }
+        });
+        return builder.create();
+    }
+
+    /**
+     * Creates a customized confirmation dialog ({@link AlertDialog}).
+     *
+     * @param activity The activity this dialog is created for.
+     * @param dialogId The id that was used with {@link Activity#showDialog(int)}
+     * @param title The resource id of the text to display in the dialog title
+     * @param message The resource id of text to display in the main dialog area
+     * @param confirmButton The resource id of the text to display in the confirm button
+     * @param cancelButton The resource id of the text to display in the cancel button
+     * @param action The action to perform if the user presses the confirm button
+     * @return A confirmation dialog with the supplied arguments
+     * @see #create(Activity,int,int,String,int,int,Runnable, Runnable)
+     */
+    public static Dialog create(final Activity activity, final int dialogId, final int title,
+                                final int message, final int confirmButton, final int cancelButton,
+                                final Runnable action) {
+
+        return create(activity, dialogId, title, activity.getString(message), confirmButton,
+                      cancelButton, action, null);
+    }
+}
diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java
index 30023b343..4f9eca5f0 100644
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@@ -97,7 +97,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
 
         this.status = truncateStatus(folder.getStatus());
 
-        if (this.name.equalsIgnoreCase(K9.INBOX)) {
+        if (this.name.equalsIgnoreCase(account.getInboxFolderName())) {
             this.displayName = context.getString(R.string.special_mailbox_name_inbox);
         } else {
             this.displayName = folder.getName();
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 61c38969d..47b346fcc 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -3,7 +3,6 @@ package com.fsck.k9.activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -18,6 +17,7 @@ import android.view.View.OnClickListener;
 import android.widget.*;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
+
 import com.fsck.k9.*;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.activity.FolderInfoHolder;
@@ -93,6 +93,7 @@ public class FolderList extends K9ListActivity {
                 public void run() {
                     mAdapter.mFolders.clear();
                     mAdapter.mFolders.addAll(newFolders);
+                    mAdapter.mFilteredFolders = mAdapter.mFolders;
                     mHandler.dataChanged();
                 }
             });
@@ -243,10 +244,10 @@ public class FolderList extends K9ListActivity {
         mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
         mListView.setLongClickable(true);
         mListView.setFastScrollEnabled(true);
-        mListView.setScrollingCacheEnabled(true);
+        mListView.setScrollingCacheEnabled(false);
         mListView.setOnItemClickListener(new OnItemClickListener() {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                onOpenFolder(((FolderInfoHolder)mAdapter.getItem(id)).name);
+                onOpenFolder(((FolderInfoHolder)mAdapter.getItem(position)).name);
             }
         });
         registerForContextMenu(mListView);
@@ -300,6 +301,7 @@ public class FolderList extends K9ListActivity {
         restorePreviousData();
 
         setListAdapter(mAdapter);
+        getListView().setTextFilterEnabled(mAdapter.getFilter() != null); // should never be false but better safe then sorry
 
         setTitle(mAccount.getDescription());
 
@@ -311,6 +313,7 @@ public class FolderList extends K9ListActivity {
 
         if (previousData != null) {
             mAdapter.mFolders = (ArrayList<FolderInfoHolder>) previousData;
+            mAdapter.mFilteredFolders = Collections.unmodifiableList(mAdapter.mFolders);
         }
     }
 
@@ -485,6 +488,7 @@ public class FolderList extends K9ListActivity {
             }
         }
 
+        onRefresh(!REFRESH_REMOTE);
     }
 
 
@@ -629,15 +633,40 @@ public class FolderList extends K9ListActivity {
 
     private void onMarkAllAsRead(final Account account, final String folder) {
         mSelectedContextFolder = mAdapter.getFolder(folder);
-        showDialog(DIALOG_MARK_ALL_AS_READ);
+        if (K9.confirmMarkAllAsRead()) {
+            showDialog(DIALOG_MARK_ALL_AS_READ);
+        } else {
+            markAllAsRead();
+        }
     }
 
+    private void markAllAsRead() {
+        try {
+            MessagingController.getInstance(getApplication())
+            .markAllMessagesRead(mAccount, mSelectedContextFolder.name);
+            mSelectedContextFolder.unreadMessageCount = 0;
+            mHandler.dataChanged();
+        } catch (Exception e) {
+            /* Ignore */
+        }
+    }
 
     @Override
     public Dialog onCreateDialog(int id) {
         switch (id) {
         case DIALOG_MARK_ALL_AS_READ:
-            return createMarkAllAsReadDialog();
+            return ConfirmationDialog.create(this, id,
+                                             R.string.mark_all_as_read_dlg_title,
+                                             getString(R.string.mark_all_as_read_dlg_instructions_fmt,
+                                                     mSelectedContextFolder.displayName),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    markAllAsRead();
+                }
+            });
         }
 
         return super.onCreateDialog(id);
@@ -657,40 +686,6 @@ public class FolderList extends K9ListActivity {
         }
     }
 
-    private Dialog createMarkAllAsReadDialog() {
-        return new AlertDialog.Builder(this)
-               .setTitle(R.string.mark_all_as_read_dlg_title)
-               .setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
-                                     mSelectedContextFolder.displayName))
-        .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_MARK_ALL_AS_READ);
-
-                try {
-
-                    MessagingController.getInstance(getApplication()).markAllMessagesRead(mAccount, mSelectedContextFolder.name);
-
-                    mSelectedContextFolder.unreadMessageCount = 0;
-
-                    mHandler.dataChanged();
-
-
-                } catch (Exception e) {
-                    // Ignore
-                }
-            }
-        })
-
-        .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_MARK_ALL_AS_READ);
-            }
-        })
-
-               .create();
-    }
-
-
     @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
@@ -715,24 +710,26 @@ public class FolderList extends K9ListActivity {
         menu.setHeaderTitle(folder.displayName);
     }
 
-    class FolderListAdapter extends BaseAdapter {
+    class FolderListAdapter extends BaseAdapter implements Filterable {
         private ArrayList<FolderInfoHolder> mFolders = new ArrayList<FolderInfoHolder>();
+        private List<FolderInfoHolder> mFilteredFolders = Collections.unmodifiableList(mFolders);
+        private Filter mFilter = new FolderListFilter();
 
         public Object getItem(long position) {
             return getItem((int)position);
         }
 
         public Object getItem(int position) {
-            return mFolders.get(position);
+            return mFilteredFolders.get(position);
         }
 
 
         public long getItemId(int position) {
-            return position ;
+            return mFilteredFolders.get(position).folder.getName().hashCode() ;
         }
 
         public int getCount() {
-            return mFolders.size();
+            return mFilteredFolders.size();
         }
 
         @Override
@@ -893,6 +890,8 @@ public class FolderList extends K9ListActivity {
                         int unreadMessageCount = localFolder.getUnreadMessageCount();
                         FolderInfoHolder folderHolder = getFolder(folderName);
                         if (folderHolder != null) {
+                            int oldUnreadMessageCount = folderHolder.unreadMessageCount;
+                            mUnreadMessageCount += unreadMessageCount - oldUnreadMessageCount;
                             folderHolder.populate(context, localFolder, mAccount, unreadMessageCount);
                             mHandler.dataChanged();
                         }
@@ -963,6 +962,7 @@ public class FolderList extends K9ListActivity {
             public void folderStatusChanged(Account account, String folderName, int unreadMessageCount) {
                 if (account.equals(mAccount)) {
                     refreshFolder(account, folderName);
+                    informUserOfStatus();
                 }
             }
 
@@ -1003,7 +1003,7 @@ public class FolderList extends K9ListActivity {
         public int getFolderIndex(String folder) {
             FolderInfoHolder searchHolder = new FolderInfoHolder();
             searchHolder.name = folder;
-            return   mFolders.indexOf(searchHolder);
+            return   mFilteredFolders.indexOf(searchHolder);
         }
 
         public FolderInfoHolder getFolder(String folder) {
@@ -1023,7 +1023,8 @@ public class FolderList extends K9ListActivity {
             if (position <= getCount()) {
                 return  getItemView(position, convertView, parent);
             } else {
-                // XXX TODO - should catch an exception here
+                Log.e(K9.LOG_TAG, "getView with illegal positon=" + position
+                      + " called! count is only " + getCount());
                 return null;
             }
         }
@@ -1123,13 +1124,84 @@ public class FolderList extends K9ListActivity {
 
         @Override
         public boolean hasStableIds() {
-            return false;
+            return true;
         }
 
         public boolean isItemSelectable(int position) {
             return true;
         }
 
+        public void setFilter(final Filter filter) {
+            this.mFilter = filter;
+        }
+
+        public Filter getFilter() {
+            return mFilter;
+        }
+
+        /**
+         * Filter to search for occurences of the search-expression in any place of the
+         * folder-name instead of doing jsut a prefix-search.
+         *
+         * @author Marcus@Wolschon.biz
+         */
+        public class FolderListFilter extends Filter {
+
+            /**
+             * Do the actual search.
+             * {@inheritDoc}
+             *
+             * @see #publishResults(CharSequence, FilterResults)
+             */
+            @Override
+            protected FilterResults performFiltering(CharSequence searchTerm) {
+                FilterResults results = new FilterResults();
+
+                if ((searchTerm == null) || (searchTerm.length() == 0)) {
+                    ArrayList<FolderInfoHolder> list = new ArrayList<FolderInfoHolder>(mFolders);
+                    results.values = list;
+                    results.count = list.size();
+                } else {
+                    final String searchTermString = searchTerm.toString().toLowerCase();
+                    final String[] words = searchTermString.split(" ");
+                    final int wordCount = words.length;
+
+                    final ArrayList<FolderInfoHolder> newValues = new ArrayList<FolderInfoHolder>();
+
+                    for (final FolderInfoHolder value : mFolders) {
+                        if (value.displayName == null) {
+                            continue;
+                        }
+                        final String valueText = value.displayName.toLowerCase();
+
+                        for (int k = 0; k < wordCount; k++) {
+                            if (valueText.contains(words[k])) {
+                                newValues.add(value);
+                                break;
+                            }
+                        }
+                    }
+
+                    results.values = newValues;
+                    results.count = newValues.size();
+                }
+
+                return results;
+            }
+
+            /**
+             * Publish the results to the user-interface.
+             * {@inheritDoc}
+             */
+            @SuppressWarnings("unchecked")
+            @Override
+            protected void publishResults(CharSequence constraint, FilterResults results) {
+                //noinspection unchecked
+                mFilteredFolders = Collections.unmodifiableList((ArrayList<FolderInfoHolder>) results.values);
+                // Send notification that the data set changed now
+                notifyDataSetChanged();
+            }
+        }
     }
 
     static class FolderViewHolder {
diff --git a/src/com/fsck/k9/activity/FolderListFilter.java b/src/com/fsck/k9/activity/FolderListFilter.java
index 364af8879..7ed58a77a 100644
--- a/src/com/fsck/k9/activity/FolderListFilter.java
+++ b/src/com/fsck/k9/activity/FolderListFilter.java
@@ -99,22 +99,27 @@ public class FolderListFilter<T> extends Filter {
     protected void publishResults(CharSequence constraint, FilterResults results) {
         // Don't notify for every change
         mFolders.setNotifyOnChange(false);
+        try {
 
-        //noinspection unchecked
-        final List<T> folders = (List<T>) results.values;
-        mFolders.clear();
-        if (folders != null) {
-            for (T folder : folders) {
-                if (folder != null) {
-                    mFolders.add(folder);
+            //noinspection unchecked
+            final List<T> folders = (List<T>) results.values;
+            mFolders.clear();
+            if (folders != null) {
+                for (T folder : folders) {
+                    if (folder != null) {
+                        mFolders.add(folder);
+                    }
                 }
+            } else {
+                Log.w(K9.LOG_TAG, "FolderListFilter.publishResults - null search-result ");
             }
-        } else {
-            Log.w(K9.LOG_TAG, "FolderListFilter.publishResults - null search-result ");
-        }
 
-        // Send notification that the data set changed now
-        mFolders.notifyDataSetChanged();
+            // Send notification that the data set changed now
+            mFolders.notifyDataSetChanged();
+        } finally {
+            // restore notification status
+            mFolders.setNotifyOnChange(true);
+        }
     }
 
     public void invalidate() {
diff --git a/src/com/fsck/k9/activity/ImportListener.java b/src/com/fsck/k9/activity/ImportListener.java
deleted file mode 100644
index 255d31ebd..000000000
--- a/src/com/fsck/k9/activity/ImportListener.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fsck.k9.activity;
-
-public interface ImportListener {
-    public void success(int numAccounts);
-
-    public void failure(String message, Exception e);
-
-    public void canceled();
-
-    public void started();
-
-}
diff --git a/src/com/fsck/k9/activity/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java
index 59ebaa5e4..8cce0d49f 100644
--- a/src/com/fsck/k9/activity/K9Activity.java
+++ b/src/com/fsck/k9/activity/K9Activity.java
@@ -15,7 +15,6 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.TranslateAnimation;
 import android.widget.ScrollView;
-
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.DateFormatter;
 
@@ -162,5 +161,4 @@ public class K9Activity extends Activity {
             return false;
         }
     }
-
 }
diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java
index a9aeaadb4..204182be2 100644
--- a/src/com/fsck/k9/activity/K9ListActivity.java
+++ b/src/com/fsck/k9/activity/K9ListActivity.java
@@ -1,12 +1,11 @@
 package com.fsck.k9.activity;
 
 import android.app.ListActivity;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.AdapterView;
 import android.widget.ListView;
-
+import android.os.Bundle;
 import com.fsck.k9.K9;
 import com.fsck.k9.helper.DateFormatter;
 
@@ -88,6 +87,4 @@ public class K9ListActivity extends ListActivity {
         }
         return super.onKeyUp(keyCode, event);
     }
-
-
 }
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 3cb514e3f..8a248b407 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1,6 +1,6 @@
-
 package com.fsck.k9.activity;
 
+
 import java.io.File;
 import java.io.Serializable;
 import java.util.*;
@@ -38,6 +38,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.Window;
 import android.webkit.WebView;
 import android.widget.AutoCompleteTextView.Validator;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
@@ -89,8 +90,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         "com.fsck.k9.activity.MessageCompose.ccShown";
     private static final String STATE_KEY_BCC_SHOWN =
         "com.fsck.k9.activity.MessageCompose.bccShown";
-    private static final String STATE_KEY_QUOTED_TEXT_SHOWN =
-        "com.fsck.k9.activity.MessageCompose.quotedTextShown";
+    private static final String STATE_KEY_QUOTED_TEXT_MODE =
+        "com.fsck.k9.activity.MessageCompose.QuotedTextShown";
     private static final String STATE_KEY_SOURCE_MESSAGE_PROCED =
         "com.fsck.k9.activity.MessageCompose.stateKeySourceMessageProced";
     private static final String STATE_KEY_DRAFT_UID =
@@ -104,6 +105,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private static final String STATE_IN_REPLY_TO = "com.fsck.k9.activity.MessageCompose.inReplyTo";
     private static final String STATE_REFERENCES = "com.fsck.k9.activity.MessageCompose.references";
     private static final String STATE_KEY_MESSAGE_FORMAT = "com.fsck.k9.activity.MessageCompose.messageFormat";
+    private static final String STATE_KEY_READ_RECEIPT = "com.fsck.k9.activity.MessageCompose.messageReadReceipt";
 
     private static final int MSG_PROGRESS_ON = 1;
     private static final int MSG_PROGRESS_OFF = 2;
@@ -115,6 +117,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private static final int ACTIVITY_REQUEST_PICK_ATTACHMENT = 1;
     private static final int ACTIVITY_CHOOSE_IDENTITY = 2;
     private static final int ACTIVITY_CHOOSE_ACCOUNT = 3;
+    private static final int CONTACT_PICKER_TO = 4;
+    private static final int CONTACT_PICKER_CC = 5;
+    private static final int CONTACT_PICKER_BCC = 6;
+
 
     /**
      * Regular expression to remove the first localized "Re:" prefix in subjects.
@@ -129,6 +135,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
      */
     private Account mAccount;
 
+
+    private Contacts mContacts;
+
     /**
      * This identity's settings are used for message composition.
      * Note: This has to be an identity of the account {@link #mAccount}.
@@ -154,8 +163,19 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
      */
     private boolean mSourceMessageProcessed = false;
 
+    private enum QuotedTextMode {
+        NONE,
+        SHOW,
+        HIDE
+    };
+
+    private boolean mReadReceipt = false;
+
+    private QuotedTextMode mQuotedTextMode = QuotedTextMode.NONE;
 
     private TextView mFromView;
+    private LinearLayout mCcWrapper;
+    private LinearLayout mBccWrapper;
     private MultiAutoCompleteTextView mToView;
     private MultiAutoCompleteTextView mCcView;
     private MultiAutoCompleteTextView mBccView;
@@ -163,6 +183,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private EditText mSignatureView;
     private EditText mMessageContentView;
     private LinearLayout mAttachments;
+    private Button mQuotedTextShow;
     private View mQuotedTextBar;
     private ImageButton mQuotedTextEdit;
     private ImageButton mQuotedTextDelete;
@@ -175,6 +196,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private TextView mCryptoSignatureUserId;
     private TextView mCryptoSignatureUserIdRest;
 
+    private ImageButton mAddToFromContacts;
+    private ImageButton mAddCcFromContacts;
+    private ImageButton mAddBccFromContacts;
+
     private PgpData mPgpData = null;
 
     private String mReferences;
@@ -354,22 +379,31 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             return;
         }
 
+        mContacts = Contacts.getInstance(MessageCompose.this);
+
         mAddressAdapter = EmailAddressAdapter.getInstance(this);
         mAddressValidator = new EmailAddressValidator();
 
-        mFromView = (TextView)findViewById(R.id.from);
-        mToView = (MultiAutoCompleteTextView)findViewById(R.id.to);
-        mCcView = (MultiAutoCompleteTextView)findViewById(R.id.cc);
-        mBccView = (MultiAutoCompleteTextView)findViewById(R.id.bcc);
-        mSubjectView = (EditText)findViewById(R.id.subject);
+        mFromView = (TextView) findViewById(R.id.from);
+        mToView = (MultiAutoCompleteTextView) findViewById(R.id.to);
+        mCcView = (MultiAutoCompleteTextView) findViewById(R.id.cc);
+        mBccView = (MultiAutoCompleteTextView) findViewById(R.id.bcc);
+        mSubjectView = (EditText) findViewById(R.id.subject);
         mSubjectView.getInputExtras(true).putBoolean("allowEmoji", true);
 
+        mAddToFromContacts = (ImageButton) findViewById(R.id.add_to);
+        mAddCcFromContacts = (ImageButton) findViewById(R.id.add_cc);
+        mAddBccFromContacts = (ImageButton) findViewById(R.id.add_bcc);
+        mCcWrapper = (LinearLayout) findViewById(R.id.cc_wrapper);
+        mBccWrapper = (LinearLayout) findViewById(R.id.bcc_wrapper);
+
         EditText upperSignature = (EditText)findViewById(R.id.upper_signature);
         EditText lowerSignature = (EditText)findViewById(R.id.lower_signature);
 
         mMessageContentView = (EditText)findViewById(R.id.message_content);
         mMessageContentView.getInputExtras(true).putBoolean("allowEmoji", true);
         mAttachments = (LinearLayout)findViewById(R.id.attachments);
+        mQuotedTextShow = (Button)findViewById(R.id.quoted_text_show);
         mQuotedTextBar = findViewById(R.id.quoted_text_bar);
         mQuotedTextEdit = (ImageButton)findViewById(R.id.quoted_text_edit);
         mQuotedTextDelete = (ImageButton)findViewById(R.id.quoted_text_delete);
@@ -420,15 +454,36 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         mMessageContentView.addTextChangedListener(watcher);
         mQuotedText.addTextChangedListener(watcher);
 
+        /* Yes, there really are poeple who ship versions of android without a contact picker */
+        if (mContacts.hasContactPicker()) {
+            mAddToFromContacts.setOnClickListener(new OnClickListener() {
+                @Override public void onClick(View v) {
+                    doLaunchContactPicker(CONTACT_PICKER_TO);
+                }
+            });
+            mAddCcFromContacts.setOnClickListener(new OnClickListener() {
+                @Override public void onClick(View v) {
+                    doLaunchContactPicker(CONTACT_PICKER_CC);
+                }
+            });
+            mAddBccFromContacts.setOnClickListener(new OnClickListener() {
+                @Override public void onClick(View v) {
+                    doLaunchContactPicker(CONTACT_PICKER_BCC);
+                }
+            });
+        } else {
+            mAddToFromContacts.setVisibility(View.GONE);
+            mAddCcFromContacts.setVisibility(View.GONE);
+            mAddBccFromContacts.setVisibility(View.GONE);
+        }
         /*
          * We set this to invisible by default. Other methods will turn it back on if it's
          * needed.
          */
-        mQuotedTextBar.setVisibility(View.GONE);
-        mQuotedText.setVisibility(View.GONE);
-        mQuotedHTML.setVisibility(View.GONE);
-        mQuotedTextEdit.setVisibility(View.GONE);
 
+        showOrHideQuotedText(QuotedTextMode.NONE);
+
+        mQuotedTextShow.setOnClickListener(this);
         mQuotedTextEdit.setOnClickListener(this);
         mQuotedTextDelete.setOnClickListener(this);
 
@@ -478,6 +533,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         }
 
         mMessageFormat = mAccount.getMessageFormat();
+        mReadReceipt = mAccount.isMessageReadReceiptAlways();
 
         if (!mSourceMessageProcessed) {
             updateFrom();
@@ -504,7 +560,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             if (!ACTION_EDIT_DRAFT.equals(action)) {
                 String bccAddress = mAccount.getAlwaysBcc();
                 if ((bccAddress != null) && !("".equals(bccAddress))) {
-                    addAddress(mBccView, new Address(bccAddress, ""));
+                    String[] bccAddresses = bccAddress.split(",");
+                    for (String oneBccAddress : bccAddresses) {
+                        addAddress(mBccView, new Address(oneBccAddress, ""));
+                    }
                 }
             }
 
@@ -668,7 +727,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private boolean setRecipients(TextView view, List<String> recipients) {
         boolean recipientAdded = false;
         if (recipients != null) {
-            StringBuffer addressList = new StringBuffer();
+            StringBuilder addressList = new StringBuilder();
             for (String recipient : recipients) {
                 addressList.append(recipient);
                 addressList.append(", ");
@@ -753,9 +812,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             attachments.add(attachment.uri);
         }
         outState.putParcelableArrayList(STATE_KEY_ATTACHMENTS, attachments);
-        outState.putBoolean(STATE_KEY_CC_SHOWN, mCcView.getVisibility() == View.VISIBLE);
-        outState.putBoolean(STATE_KEY_BCC_SHOWN, mBccView.getVisibility() == View.VISIBLE);
-        outState.putBoolean(STATE_KEY_QUOTED_TEXT_SHOWN, mQuotedTextBar.getVisibility() == View.VISIBLE);
+        outState.putBoolean(STATE_KEY_CC_SHOWN, mCcWrapper.getVisibility() == View.VISIBLE);
+        outState.putBoolean(STATE_KEY_BCC_SHOWN, mBccWrapper.getVisibility() == View.VISIBLE);
+        outState.putSerializable(STATE_KEY_QUOTED_TEXT_MODE, mQuotedTextMode);
         outState.putBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, mSourceMessageProcessed);
         outState.putString(STATE_KEY_DRAFT_UID, mDraftUid);
         outState.putSerializable(STATE_IDENTITY, mIdentity);
@@ -765,6 +824,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         outState.putString(STATE_REFERENCES, mReferences);
         outState.putSerializable(STATE_KEY_HTML_QUOTE, mQuotedHtmlContent);
         outState.putSerializable(STATE_KEY_MESSAGE_FORMAT, mMessageFormat);
+        outState.putBoolean(STATE_KEY_READ_RECEIPT, mReadReceipt);
     }
 
     @Override
@@ -777,20 +837,21 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             addAttachment(uri);
         }
 
-        mMessageFormat = (MessageFormat)savedInstanceState.getSerializable(STATE_KEY_MESSAGE_FORMAT);
-        mCcView.setVisibility(savedInstanceState.getBoolean(STATE_KEY_CC_SHOWN) ? View.VISIBLE : View.GONE);
-        mBccView.setVisibility(savedInstanceState.getBoolean(STATE_KEY_BCC_SHOWN) ? View.VISIBLE : View.GONE);
-        if (mMessageFormat == MessageFormat.HTML) {
+        mMessageFormat = (MessageFormat) savedInstanceState
+                         .getSerializable(STATE_KEY_MESSAGE_FORMAT);
+        mReadReceipt = savedInstanceState
+                         .getBoolean(STATE_KEY_READ_RECEIPT);
+        mCcWrapper.setVisibility(savedInstanceState.getBoolean(STATE_KEY_CC_SHOWN) ? View.VISIBLE
+                                 : View.GONE);
+        mBccWrapper.setVisibility(savedInstanceState
+                                  .getBoolean(STATE_KEY_BCC_SHOWN) ? View.VISIBLE : View.GONE);
+        showOrHideQuotedText((QuotedTextMode)savedInstanceState.getSerializable(STATE_KEY_QUOTED_TEXT_MODE));
+
+        if (mQuotedTextMode != QuotedTextMode.NONE && mMessageFormat == MessageFormat.HTML) {
             mQuotedHtmlContent = (InsertableHtmlContent) savedInstanceState.getSerializable(STATE_KEY_HTML_QUOTE);
-            mQuotedTextBar.setVisibility(savedInstanceState.getBoolean(STATE_KEY_QUOTED_TEXT_SHOWN) ? View.VISIBLE : View.GONE);
-            mQuotedHTML.setVisibility(savedInstanceState.getBoolean(STATE_KEY_QUOTED_TEXT_SHOWN) ? View.VISIBLE : View.GONE);
             if (mQuotedHtmlContent != null && mQuotedHtmlContent.getQuotedContent() != null) {
                 mQuotedHTML.loadDataWithBaseURL("http://", mQuotedHtmlContent.getQuotedContent(), "text/html", "utf-8", null);
-                mQuotedTextEdit.setVisibility(View.VISIBLE);
             }
-        } else {
-            mQuotedTextBar.setVisibility(savedInstanceState.getBoolean(STATE_KEY_QUOTED_TEXT_SHOWN) ? View.VISIBLE : View.GONE);
-            mQuotedText.setVisibility(savedInstanceState.getBoolean(STATE_KEY_QUOTED_TEXT_SHOWN) ? View.VISIBLE : View.GONE);
         }
         mDraftUid = savedInstanceState.getString(STATE_KEY_DRAFT_UID);
         mIdentity = (Identity)savedInstanceState.getSerializable(STATE_IDENTITY);
@@ -855,6 +916,12 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
         String text = mMessageContentView.getText().toString();
 
+        boolean saveQuotedText = false;
+        if (isDraft || mQuotedTextMode.equals(QuotedTextMode.SHOW)) {
+            saveQuotedText = true;
+        }
+
+
         // Handle HTML separate from the rest of the text content. HTML mode doesn't allow signature after the quoted
         // text, nor does it allow reply after quote. Users who want that functionality will need to stick with text
         // mode.
@@ -867,11 +934,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             // Insert it into the existing content object.
             if (K9.DEBUG && mQuotedHtmlContent != null)
                 Log.d(K9.LOG_TAG, "insertable: " + mQuotedHtmlContent.toDebugString());
-            if (mQuotedHtmlContent != null) {
-                // Remove the quoted part if it's no longer visible.
-                if (mQuotedTextBar.getVisibility() != View.VISIBLE) {
-                    mQuotedHtmlContent.clearQuotedContent();
-                }
+            if (mQuotedHtmlContent != null && saveQuotedText) {
 
                 // Set the insertion location based upon our reply after quote setting. Reply after
                 // quote makes no sense for HEADER style replies. In addition, add some extra
@@ -912,11 +975,13 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             Integer composedMessageOffset = 0;
 
             // Placing the signature before the quoted text does not make sense if replyAfterQuote is true.
-            if (!replyAfterQuote && !isDraft && mAccount.isSignatureBeforeQuotedText()) {
-                text = appendSignature(text);
+            if (!isDraft) {
+                if (!replyAfterQuote && mAccount.isSignatureBeforeQuotedText()) {
+                    text = appendSignature(text);
+                }
             }
 
-            if (mQuotedTextBar.getVisibility() == View.VISIBLE) {
+            if (saveQuotedText) {
                 if (replyAfterQuote) {
                     composedMessageOffset = mQuotedText.getText().toString().length() + "\n".length();
                     text = mQuotedText.getText().toString() + "\n" + text;
@@ -927,10 +992,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
             // Note: If user has selected reply after quote AND signature before quote, ignore the
             // latter setting and append the signature at the end.
-            if (!isDraft && (!mAccount.isSignatureBeforeQuotedText() || replyAfterQuote)) {
-                text = appendSignature(text);
+            if (!isDraft) {
+                if (replyAfterQuote || !mAccount.isSignatureBeforeQuotedText()) {
+                    text = appendSignature(text);
+                }
             }
-
             // Build the body.
             TextBody body = new TextBody(text);
             body.setComposedMessageLength(composedMessageLength);
@@ -960,6 +1026,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         message.setRecipients(RecipientType.CC, getAddresses(mCcView));
         message.setRecipients(RecipientType.BCC, getAddresses(mBccView));
         message.setSubject(mSubjectView.getText().toString());
+        if (mReadReceipt) {
+            message.setHeader("Disposition-Notification-To", from.toEncodedString());
+            message.setHeader("X-Confirm-Reading-To", from.toEncodedString());
+            message.setHeader("Return-Receipt-To", from.toEncodedString());
+        }
         message.setHeader("User-Agent", getString(R.string.message_header_mua));
 
         final String replyTo = mIdentity.getReplyTo();
@@ -1084,11 +1155,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         LENGTH("l"),
         OFFSET("o"),
         MESSAGE_FORMAT("f"),
+        MESSAGE_READ_RECEIPT("r"),
         SIGNATURE("s"),
         NAME("n"),
         EMAIL("e"),
         // TODO - store a reference to the message being replied so we can mark it at the time of send.
-        ORIGINAL_MESSAGE("m");
+        ORIGINAL_MESSAGE("m"),
+        CURSOR_POSITION("p"),   // Where in the message your cursor was when you saved.
+        QUOTED_TEXT_MODE("q");
 
         private final String value;
 
@@ -1151,6 +1225,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             uri.appendQueryParameter(IdentityField.ORIGINAL_MESSAGE.value(), mMessageReference.toIdentityString());
         }
 
+        uri.appendQueryParameter(IdentityField.CURSOR_POSITION.value(), Integer.toString(mMessageContentView.getSelectionStart()));
+
+        uri.appendQueryParameter(IdentityField.QUOTED_TEXT_MODE.value(), mQuotedTextMode.name());
+
         String k9identity = IDENTITY_VERSION_1 + uri.build().getEncodedQuery();
 
         if (K9.DEBUG) {
@@ -1225,6 +1303,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             if (tokens.hasMoreTokens()) {
                 identity.put(IdentityField.EMAIL, Utility.base64Decode(tokens.nextToken()));
             }
+            if (tokens.hasMoreTokens()) {
+                identity.put(IdentityField.QUOTED_TEXT_MODE, Utility.base64Decode(tokens.nextToken()));
+            }
         }
 
         return identity;
@@ -1351,10 +1432,23 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     }
 
     private void onAddCcBcc() {
-        mCcView.setVisibility(View.VISIBLE);
-        mBccView.setVisibility(View.VISIBLE);
+        mCcWrapper.setVisibility(View.VISIBLE);
+        mBccWrapper.setVisibility(View.VISIBLE);
     }
 
+    private void onReadReceipt() {
+        CharSequence txt;
+        if (mReadReceipt == false) {
+            txt=getString(R.string.read_receipt_enabled);
+            mReadReceipt = true;
+        } else {
+            txt=getString(R.string.read_receipt_disabled);
+            mReadReceipt = false;
+        }
+        Context context = getApplicationContext();
+        Toast toast = Toast.makeText(context, txt, Toast.LENGTH_SHORT);
+        toast.show();
+    }
     /**
      * Kick off a picker for whatever kind of MIME types we'll accept and let Android take over.
      */
@@ -1480,10 +1574,37 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             break;
         case ACTIVITY_CHOOSE_ACCOUNT:
             onAccountChosen(data);
+            break;
+        case CONTACT_PICKER_TO:
+        case CONTACT_PICKER_CC:
+        case CONTACT_PICKER_BCC:
+            String email = mContacts.getEmailFromContactPicker(data);
+            if (email.length() == 0) {
+                Toast.makeText(this, getString(R.string.error_contact_address_not_found), Toast.LENGTH_LONG).show();
+                return;
+            }
+            if (requestCode == CONTACT_PICKER_TO) {
+                addAddress(mToView, new Address(email, ""));
+            } else if (requestCode == CONTACT_PICKER_CC) {
+                addAddress(mCcView, new Address(email, ""));
+            } else if (requestCode == CONTACT_PICKER_BCC) {
+                addAddress(mBccView, new Address(email, ""));
+            } else {
+                return;
+            }
+
+
+
             break;
         }
     }
 
+    public void doLaunchContactPicker(int resultId) {
+        startActivityForResult(mContacts.contactPickerIntent(), resultId);
+    }
+
+
+
     private void onAccountChosen(final Intent intent) {
         final Bundle extras = intent.getExtras();
         final String uuid = extras.getString(ChooseAccount.EXTRA_ACCOUNT);
@@ -1574,8 +1695,12 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             mAttachments.removeView((View) view.getTag());
             mDraftNeedsSaving = true;
             break;
+        case R.id.quoted_text_show:
+            showOrHideQuotedText(QuotedTextMode.SHOW);
+            mDraftNeedsSaving = true;
+            break;
         case R.id.quoted_text_delete:
-            deleteQuotedText();
+            showOrHideQuotedText(QuotedTextMode.HIDE);
             mDraftNeedsSaving = true;
             break;
         case R.id.quoted_text_edit:
@@ -1592,15 +1717,37 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         }
     }
 
-    /**
-     * Delete the quoted text.
+    /*
+     * Show or Hide the quoted text according to mQuotedTextMode.
      */
-    private void deleteQuotedText() {
-        mQuotedTextBar.setVisibility(View.GONE);
-        mQuotedText.setVisibility(View.GONE);
-        mQuotedHTML.setVisibility(View.GONE);
-        if (mQuotedHtmlContent != null) {
-            mQuotedHtmlContent.clearQuotedContent();
+    private void showOrHideQuotedText(QuotedTextMode mode) {
+        mQuotedTextMode = mode;
+        if (mQuotedTextMode == QuotedTextMode.NONE) {
+            mQuotedTextShow.setVisibility(View.GONE);
+            mQuotedTextBar.setVisibility(View.GONE);
+
+            mQuotedText.setVisibility(View.GONE);
+            mQuotedHTML.setVisibility(View.GONE);
+            mQuotedTextEdit.setVisibility(View.GONE);
+        } else if (mQuotedTextMode == QuotedTextMode.SHOW) {
+            mQuotedTextShow.setVisibility(View.GONE);
+            mQuotedTextBar.setVisibility(View.VISIBLE);
+            if (mMessageFormat == MessageFormat.HTML) {
+                mQuotedText.setVisibility(View.GONE);
+                mQuotedHTML.setVisibility(View.VISIBLE);
+                mQuotedTextEdit.setVisibility(View.VISIBLE);
+            } else {
+                mQuotedText.setVisibility(View.VISIBLE);
+                mQuotedHTML.setVisibility(View.GONE);
+                mQuotedTextEdit.setVisibility(View.GONE);
+            }
+        } else if (mQuotedTextMode == QuotedTextMode.HIDE) {
+            mQuotedTextShow.setVisibility(View.VISIBLE);
+            mQuotedTextBar.setVisibility(View.GONE);
+
+            mQuotedText.setVisibility(View.GONE);
+            mQuotedHTML.setVisibility(View.GONE);
+            mQuotedTextEdit.setVisibility(View.GONE);
         }
     }
 
@@ -1632,6 +1779,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         case R.id.choose_identity:
             onChooseIdentity();
             break;
+        case R.id.read_receipt:
+            onReadReceipt();
         default:
             return super.onOptionsItemSelected(item);
         }
@@ -1815,7 +1964,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     mInReplyTo = message.getMessageId();
 
                     if (message.getReferences() != null && message.getReferences().length > 0) {
-                        StringBuffer buffy = new StringBuffer();
+                        StringBuilder buffy = new StringBuilder();
                         for (int i = 0; i < message.getReferences().length; i++)
                             buffy.append(message.getReferences()[i]);
 
@@ -1830,7 +1979,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                 }
 
                 // Quote the message and setup the UI.
-                populateUIWithQuotedMessage();
+                populateUIWithQuotedMessage(mAccount.isDefaultQuotedTextShown());
 
                 if (ACTION_REPLY_ALL.equals(action) || ACTION_REPLY.equals(action)) {
                     Identity useIdentity = null;
@@ -1874,7 +2023,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                             }
 
                         }
-                        mCcView.setVisibility(View.VISIBLE);
+                        mCcWrapper.setVisibility(View.VISIBLE);
                     }
                 }
             } else if (ACTION_FORWARD.equals(action)) {
@@ -1885,7 +2034,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                 }
 
                 // Quote the message and setup the UI.
-                populateUIWithQuotedMessage();
+                populateUIWithQuotedMessage(true);
 
                 if (!mSourceMessageProcessed) {
                     if (!loadAttachments(message, 0)) {
@@ -1893,12 +2042,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     }
                 }
             } else if (ACTION_EDIT_DRAFT.equals(action)) {
+                String showQuotedTextMode = "NONE";
+
                 mDraftUid = message.getUid();
                 mSubjectView.setText(message.getSubject());
                 addAddresses(mToView, message.getRecipients(RecipientType.TO));
                 if (message.getRecipients(RecipientType.CC).length > 0) {
                     addAddresses(mCcView, message.getRecipients(RecipientType.CC));
-                    mCcView.setVisibility(View.VISIBLE);
+                    mCcWrapper.setVisibility(View.VISIBLE);
                 }
 
                 Address[] bccRecipients = message.getRecipients(RecipientType.BCC);
@@ -1907,9 +2058,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     String bccAddress = mAccount.getAlwaysBcc();
                     if (bccRecipients.length == 1 && bccAddress != null && bccAddress.equals(bccRecipients[0].toString())) {
                         // If the auto-bcc is the only entry in the BCC list, don't show the Bcc fields.
-                        mBccView.setVisibility(View.GONE);
+                        mBccWrapper.setVisibility(View.GONE);
                     } else {
-                        mBccView.setVisibility(View.VISIBLE);
+                        mBccWrapper.setVisibility(View.VISIBLE);
                     }
                 }
 
@@ -1969,6 +2120,19 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     }
                 }
 
+                int cursorPosition = 0;
+                if (k9identity.containsKey(IdentityField.CURSOR_POSITION)) {
+                    try {
+                        cursorPosition = Integer.valueOf(k9identity.get(IdentityField.CURSOR_POSITION)).intValue();
+                    } catch (Exception e) {
+                        Log.e(K9.LOG_TAG, "Could not parse cursor position for MessageCompose; continuing.", e);
+                    }
+                }
+
+                if (k9identity.containsKey(IdentityField.QUOTED_TEXT_MODE)) {
+                    showQuotedTextMode = k9identity.get(IdentityField.QUOTED_TEXT_MODE);
+                }
+
                 mIdentity = newIdentity;
 
                 updateSignature();
@@ -1983,96 +2147,72 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                 // Always respect the user's current composition format preference, even if the
                 // draft was saved in a different format.
                 // TODO - The current implementation doesn't allow a user in HTML mode to edit a draft that wasn't saved with K9mail.
+                String messageFormat = k9identity.get(IdentityField.MESSAGE_FORMAT);
+                if (messageFormat == null) {
+                    // This message probably wasn't created by us. The exception is legacy
+                    // drafts created before the advent of HTML composition. In those cases,
+                    // we'll display the whole message (including the quoted part) in the
+                    // composition window. If that's the case, try and convert it to text to
+                    // match the behavior in text mode.
+                    mMessageContentView.setText(getBodyTextFromMessage(message, MessageFormat.TEXT));
+                    mMessageFormat = MessageFormat.TEXT;
+                    showOrHideQuotedText(QuotedTextMode.valueOf(showQuotedTextMode));
+                    return;
+                }
+
+                mMessageFormat = MessageFormat.valueOf(messageFormat);
+
                 if (mMessageFormat == MessageFormat.HTML) {
-                    if (k9identity.get(IdentityField.MESSAGE_FORMAT) == null || !MessageFormat.valueOf(k9identity.get(IdentityField.MESSAGE_FORMAT)).equals(MessageFormat.HTML)) {
-                        // This message probably wasn't created by us. The exception is legacy
-                        // drafts created before the advent of HTML composition. In those cases,
-                        // we'll display the whole message (including the quoted part) in the
-                        // composition window. If that's the case, try and convert it to text to
-                        // match the behavior in text mode.
-                        mMessageContentView.setText(getBodyTextFromMessage(message, MessageFormat.TEXT));
-                    } else {
-                        Part part = MimeUtility.findFirstPartByMimeType(message, "text/html");
-                        if (part != null) { // Shouldn't happen if we were the one who saved it.
-                            String text = MimeUtility.getTextFromPart(part);
-                            if (K9.DEBUG) {
-                                Log.d(K9.LOG_TAG, "Loading message with offset " + bodyOffset + ", length " + bodyLength + ". Text length is " + text.length() + ".");
-                            }
+                    Part part = MimeUtility.findFirstPartByMimeType(message, "text/html");
+                    if (part != null) { // Shouldn't happen if we were the one who saved it.
+                        String text = MimeUtility.getTextFromPart(part);
+                        if (K9.DEBUG) {
+                            Log.d(K9.LOG_TAG, "Loading message with offset " + bodyOffset + ", length " + bodyLength + ". Text length is " + text.length() + ".");
+                        }
 
-                            // Grab our reply text.
-                            String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
-                            mMessageContentView.setText(HtmlConverter.htmlToText(bodyText));
+                        // Grab our reply text.
+                        String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
+                        mMessageContentView.setText(HtmlConverter.htmlToText(bodyText));
 
-                            // Regenerate the quoted html without our user content in it.
-                            StringBuilder quotedHTML = new StringBuilder();
-                            quotedHTML.append(text.substring(0, bodyOffset));   // stuff before the reply
-                            quotedHTML.append(text.substring(bodyOffset + bodyLength));
-                            if (quotedHTML.length() > 0) {
-                                mQuotedHtmlContent = new InsertableHtmlContent();
-                                mQuotedHtmlContent.setQuotedContent(quotedHTML);
-                                mQuotedHtmlContent.setHeaderInsertionPoint(bodyOffset);
-                                mQuotedHTML.loadDataWithBaseURL("http://", mQuotedHtmlContent.getQuotedContent(), "text/html", "utf-8", null);
-                                mQuotedHTML.setVisibility(View.VISIBLE);
-                                mQuotedTextBar.setVisibility(View.VISIBLE);
-                                mQuotedTextEdit.setVisibility(View.VISIBLE);
-                            }
+                        // Regenerate the quoted html without our user content in it.
+                        StringBuilder quotedHTML = new StringBuilder();
+                        quotedHTML.append(text.substring(0, bodyOffset));   // stuff before the reply
+                        quotedHTML.append(text.substring(bodyOffset + bodyLength));
+                        if (quotedHTML.length() > 0) {
+                            mQuotedHtmlContent = new InsertableHtmlContent();
+                            mQuotedHtmlContent.setQuotedContent(quotedHTML);
+                            mQuotedHtmlContent.setHeaderInsertionPoint(bodyOffset);
+                            mQuotedHTML.loadDataWithBaseURL("http://", mQuotedHtmlContent.getQuotedContent(), "text/html", "utf-8", null);
                         }
                     }
                 } else if (mMessageFormat == MessageFormat.TEXT) {
-                    MessageFormat format = k9identity.get(IdentityField.MESSAGE_FORMAT) != null
-                                           ? MessageFormat.valueOf(k9identity.get(IdentityField.MESSAGE_FORMAT))
-                                           : null;
-                    if (format == null) {
-                        mMessageContentView.setText(getBodyTextFromMessage(message, MessageFormat.TEXT));
-                    } else if (format.equals(MessageFormat.HTML)) {
-                        // We are in text mode, but have an HTML message.
-                        Part htmlPart = MimeUtility.findFirstPartByMimeType(message, "text/html");
-                        if (htmlPart != null) { // Shouldn't happen if we were the one who saved it.
-                            String text = MimeUtility.getTextFromPart(htmlPart);
-                            if (K9.DEBUG) {
-                                Log.d(K9.LOG_TAG, "Loading message with offset " + bodyOffset + ", length " + bodyLength + ". Text length is " + text.length() + ".");
-                            }
+                    Part textPart = MimeUtility.findFirstPartByMimeType(message, "text/plain");
+                    if (textPart != null) {
+                        String text = MimeUtility.getTextFromPart(textPart);
+                        // If we had a body length (and it was valid), separate the composition from the quoted text
+                        // and put them in their respective places in the UI.
+                        if (bodyLength != null && bodyLength + 1 < text.length()) { // + 1 to get rid of the newline we added when saving the draft
+                            String bodyText = text.substring(0, bodyLength);
+                            String quotedText = text.substring(bodyLength + 1, text.length());
 
-                            // Grab our reply text.
-                            String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
-                            mMessageContentView.setText(Html.fromHtml(bodyText).toString());
-
-                            // Regenerate the quoted html without out content in it.
-                            StringBuilder quotedHTML = new StringBuilder();
-                            quotedHTML.append(text.substring(0, bodyOffset));   // stuff before the reply
-                            quotedHTML.append(text.substring(bodyOffset + bodyLength));
-                            // Convert it to text.
-                            mQuotedText.setText(HtmlConverter.htmlToText(quotedHTML.toString()));
-
-                            mQuotedTextBar.setVisibility(View.VISIBLE);
-                            mQuotedText.setVisibility(View.VISIBLE);
+                            mMessageContentView.setText(bodyText);
+                            mQuotedText.setText(quotedText);
                         } else {
-                            Log.e(K9.LOG_TAG, "Found an HTML draft but couldn't find the HTML part!  Something's wrong.");
+                            mMessageContentView.setText(text);
                         }
-                    } else if (format.equals(MessageFormat.TEXT)) {
-                        Part textPart = MimeUtility.findFirstPartByMimeType(message, "text/plain");
-                        if (textPart != null) {
-                            String text = MimeUtility.getTextFromPart(textPart);
-                            // If we had a body length (and it was valid), separate the composition from the quoted text
-                            // and put them in their respective places in the UI.
-                            if (bodyLength != null && bodyLength + 1 < text.length()) { // + 1 to get rid of the newline we added when saving the draft
-                                String bodyText = text.substring(0, bodyLength);
-                                String quotedText = text.substring(bodyLength + 1, text.length());
-
-                                mMessageContentView.setText(bodyText);
-                                mQuotedText.setText(quotedText);
-
-                                mQuotedTextBar.setVisibility(View.VISIBLE);
-                                mQuotedText.setVisibility(View.VISIBLE);
-                                mQuotedHTML.setVisibility(View.VISIBLE);
-                            } else {
-                                mMessageContentView.setText(text);
-                            }
-                        }
-                    } else {
-                        Log.e(K9.LOG_TAG, "Unhandled message format.");
                     }
+                } else {
+                    Log.e(K9.LOG_TAG, "Unhandled message format.");
                 }
+
+                // Set the cursor position if we have it.
+                try {
+                    mMessageContentView.setSelection(cursorPosition);
+                } catch (Exception e) {
+                    Log.e(K9.LOG_TAG, "Could not set cursor position in MessageCompose; ignoring.", e);
+                }
+
+                showOrHideQuotedText(QuotedTextMode.valueOf(showQuotedTextMode));
             }
         } catch (MessagingException me) {
             /**
@@ -2080,16 +2220,17 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
              * the source message. Log it as an error, though.
              */
             Log.e(K9.LOG_TAG, "Error while processing source message: ", me);
+        } finally {
+            mSourceMessageProcessed = true;
+            mDraftNeedsSaving = false;
         }
-        mSourceMessageProcessed = true;
-        mDraftNeedsSaving = false;
     }
 
     /**
      * Build and populate the UI with the quoted message.
      * @throws MessagingException
      */
-    private void populateUIWithQuotedMessage() throws MessagingException {
+    private void populateUIWithQuotedMessage(boolean shown) throws MessagingException {
         // TODO -- I am assuming that mSourceMessageBody will always be a text part.  Is this a safe assumption?
 
         // Handle the original message in the reply
@@ -2103,20 +2244,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             // Load the message with the reply header.
             mQuotedHTML.loadDataWithBaseURL("http://", mQuotedHtmlContent.getQuotedContent(), "text/html", "utf-8", null);
 
-            mQuotedTextBar.setVisibility(View.VISIBLE);
-            mQuotedHTML.setVisibility(View.VISIBLE);
-            mQuotedTextEdit.setVisibility(View.VISIBLE);
-
-            mQuotedText.setVisibility(View.GONE);
         } else if (mMessageFormat == MessageFormat.TEXT) {
             mQuotedText.setText(quoteOriginalTextMessage(mSourceMessage, content, mAccount.getQuoteStyle()));
+        }
 
-            mQuotedTextBar.setVisibility(View.VISIBLE);
-            mQuotedText.setVisibility(View.VISIBLE);
-
-            mQuotedHtmlContent = null;
-            mQuotedTextEdit.setVisibility(View.GONE);
-            mQuotedHTML.setVisibility(View.GONE);
+        if (shown) {
+            showOrHideQuotedText(QuotedTextMode.SHOW);
+        } else {
+            showOrHideQuotedText(QuotedTextMode.HIDE);
         }
     }
 
@@ -2328,10 +2463,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                     // part).
                     if (mSourceProcessed) {
                         try {
-                            populateUIWithQuotedMessage();
+                            populateUIWithQuotedMessage(true);
                         } catch (MessagingException e) {
                             // Hm, if we couldn't populate the UI after source reprocessing, let's just delete it?
-                            deleteQuotedText();
+                            showOrHideQuotedText(QuotedTextMode.HIDE);
                             Log.e(K9.LOG_TAG, "Could not re-process source message; deleting quoted text to be safe.", e);
                         }
                     } else {
@@ -2448,10 +2583,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             }
 
             try {
-                final Contacts contacts = Contacts.getInstance(MessageCompose.this);
-                contacts.markAsContacted(message.getRecipients(RecipientType.TO));
-                contacts.markAsContacted(message.getRecipients(RecipientType.CC));
-                contacts.markAsContacted(message.getRecipients(RecipientType.BCC));
+                mContacts.markAsContacted(message.getRecipients(RecipientType.TO));
+                mContacts.markAsContacted(message.getRecipients(RecipientType.CC));
+                mContacts.markAsContacted(message.getRecipients(RecipientType.BCC));
             } catch (Exception e) {
                 Log.e(K9.LOG_TAG, "Failed to mark contact as contacted.", e);
             }
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 3627a9efe..5b41c8b28 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -11,44 +11,44 @@ import java.util.Map;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
-import android.text.style.TextAppearanceSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Animation.AnimationListener;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector;
+import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.View.OnClickListener;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.AccountStats;
@@ -61,16 +61,16 @@ import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
 import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.controller.MessagingController;
-import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.controller.MessagingController.SORT_TYPE;
+import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.MessageHelper;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.store.LocalStore;
-import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
+import com.fsck.k9.mail.store.StorageManager;
 
 
 /**
@@ -207,8 +207,6 @@ public class MessageList
 
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
-    private static final int ACTIVITY_CHOOSE_FOLDER_MOVE_BATCH = 3;
-    private static final int ACTIVITY_CHOOSE_FOLDER_COPY_BATCH = 4;
 
     private static final String EXTRA_ACCOUNT = "account";
     private static final String EXTRA_FOLDER  = "folder";
@@ -298,9 +296,21 @@ public class MessageList
     private FontSizes mFontSizes = K9.getFontSizes();
 
     private Bundle mState = null;
-    private MessageInfoHolder mSelectedMessage = null;
 
-    private Context context = null;
+    /**
+     * Remember the selection to be consistent between menu display and menu item
+     * selection
+     */
+    private MessageInfoHolder mSelectedMessage;
+
+    /**
+     * Relevant messages for the current context when we have to remember the
+     * chosen messages between user interactions (eg. Selecting a folder for
+     * move operation)
+     */
+    private List<MessageInfoHolder> mActiveMessages;
+
+    private Context context;
 
     /* package visibility for faster inner class access */
     MessageHelper mMessageHelper = MessageHelper.getInstance(this);
@@ -327,8 +337,15 @@ public class MessageList
     }
 
     class MessageListHandler {
-        public void removeMessage(final List<MessageInfoHolder> messages) {
+        /**
+         * @param messages Never {@code null}.
+         */
+        public void removeMessages(final List<MessageInfoHolder> messages) {
+            if (messages.isEmpty()) {
+                return;
+            }
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     for (MessageInfoHolder message : messages) {
                         if (message != null) {
@@ -348,9 +365,16 @@ public class MessageList
             });
         }
 
+        /**
+         * @param messages Never {@code null}.
+         */
         public void addMessages(final List<MessageInfoHolder> messages) {
+            if (messages.isEmpty()) {
+                return;
+            }
             final boolean wasEmpty = mAdapter.messages.isEmpty();
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     for (final MessageInfoHolder message : messages) {
                         if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) {
@@ -379,6 +403,7 @@ public class MessageList
 
         private void resetUnreadCount() {
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     resetUnreadCountOnThread();
                 }
@@ -402,6 +427,7 @@ public class MessageList
             final Comparator<MessageInfoHolder> chainComparator = getComparator();
 
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     synchronized (mAdapter.messages) {
                         Collections.sort(mAdapter.messages, chainComparator);
@@ -459,6 +485,7 @@ public class MessageList
 
         private void refreshTitle() {
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     refreshTitleOnThread();
                 }
@@ -492,7 +519,7 @@ public class MessageList
             if (mFolderName != null) {
                 displayName  = mFolderName;
 
-                if (K9.INBOX.equalsIgnoreCase(displayName)) {
+                if (mAccount.getInboxFolderName().equalsIgnoreCase(displayName)) {
                     displayName = getString(R.string.special_mailbox_name_inbox);
                 } else if (mAccount.getOutboxFolderName().equals(displayName)) {
                     displayName = getString(R.string.special_mailbox_name_outbox);
@@ -512,6 +539,7 @@ public class MessageList
 
         public void progress(final boolean progress) {
             runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     showProgressIndicator(progress);
                 }
@@ -566,9 +594,10 @@ public class MessageList
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        // Use mListView.getAdapter() to get the WrapperListAdapter that includes the footer view.
-        if (mCurrentFolder != null && ((position + 1) == mListView.getAdapter().getCount())) {
-            mController.loadMoreMessages(mAccount, mFolderName, mAdapter.mListener);
+        if (view == mFooterView) {
+            if (mCurrentFolder != null) {
+                mController.loadMoreMessages(mAccount, mFolderName, mAdapter.mListener);
+            }
             return;
         }
 
@@ -576,7 +605,7 @@ public class MessageList
         if (mSelectedCount > 0) {
             // In multiselect mode make sure that clicking on the item results
             // in toggling the 'selected' checkbox.
-            setSelected(message, !message.selected);
+            setSelected(Collections.singletonList(message), !message.selected);
         } else {
             onOpenMessage(message);
         }
@@ -650,12 +679,12 @@ public class MessageList
         mListView.setAdapter(mAdapter);
     }
 
-    @SuppressWarnings("unchecked")
     private void restorePreviousData() {
-        final Object previousData = getLastNonConfigurationInstance();
+        final ActivityState previousData = getLastNonConfigurationInstance();
 
         if (previousData != null) {
-            mAdapter.messages.addAll((List<MessageInfoHolder>) previousData);
+            mAdapter.messages.addAll(previousData.messages);
+            mActiveMessages = previousData.activeMessages;
         }
     }
 
@@ -727,6 +756,9 @@ public class MessageList
             }
 
         } else {
+            // reread the selected date format preference in case it has changed
+            mMessageHelper.refresh();
+
             new Thread() {
                 @Override
                 public void run() {
@@ -741,6 +773,7 @@ public class MessageList
 
                     mAdapter.pruneDirtyMessages();
                     runOnUiThread(new Runnable() {
+                        @Override
                         public void run() {
                             mAdapter.notifyDataSetChanged();
                             restoreListState();
@@ -767,7 +800,7 @@ public class MessageList
         mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
         mListView.setLongClickable(true);
         mListView.setFastScrollEnabled(true);
-        mListView.setScrollingCacheEnabled(true);
+        mListView.setScrollingCacheEnabled(false);
         mListView.setOnItemClickListener(this);
         mListView.addFooterView(getFooterView(mListView));
 
@@ -787,6 +820,7 @@ public class MessageList
         // Gesture detection
         gestureDetector = new GestureDetector(new MyGestureDetector());
         gestureListener = new View.OnTouchListener() {
+            @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (gestureDetector.onTouchEvent(event)) {
                     return true;
@@ -798,9 +832,45 @@ public class MessageList
         mListView.setOnTouchListener(gestureListener);
     }
 
+    /**
+     * Container for values to be kept while the device configuration is
+     * modified at runtime (keyboard, orientation, etc.) and Android restarts
+     * this activity.
+     *
+     * @see MessageList#onRetainNonConfigurationInstance()
+     * @see MessageList#getLastNonConfigurationInstance()
+     */
+    static class ActivityState {
+        public List<MessageInfoHolder> messages;
+        public List<MessageInfoHolder> activeMessages;
+    }
+
+    /* (non-Javadoc)
+     *
+     * Method overridden for proper typing within this class (the return type is
+     * more specific than the super implementation)
+     *
+     * @see android.app.Activity#onRetainNonConfigurationInstance()
+     */
     @Override
-    public Object onRetainNonConfigurationInstance() {
-        return mAdapter.messages;
+    public ActivityState onRetainNonConfigurationInstance() {
+        final ActivityState state = new ActivityState();
+        state.messages = mAdapter.messages;
+        state.activeMessages = mActiveMessages;
+        return state;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * Method overridden for proper typing within this class (the return type is
+     * more specific than the super implementation)
+     *
+     * @see android.app.Activity#getLastNonConfigurationInstance()
+     */
+    @Override
+    public ActivityState getLastNonConfigurationInstance() {
+        return (ActivityState) super.getLastNonConfigurationInstance();
     }
 
     @Override
@@ -909,18 +979,20 @@ public class MessageList
             if (position >= 0) {
                 MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
 
+                final List<MessageInfoHolder> selection = getSelectionFromMessage(message);
+
                 if (message != null) {
                     switch (keyCode) {
                     case KeyEvent.KEYCODE_DEL: {
-                        onDelete(message, position);
+                        onDelete(selection);
                         return true;
                     }
                     case KeyEvent.KEYCODE_S: {
-                        setSelected(message, !message.selected);
+                        setSelected(selection, !message.selected);
                         return true;
                     }
                     case KeyEvent.KEYCODE_D: {
-                        onDelete(message, position);
+                        onDelete(selection);
                         return true;
                     }
                     case KeyEvent.KEYCODE_F: {
@@ -936,23 +1008,23 @@ public class MessageList
                         return true;
                     }
                     case KeyEvent.KEYCODE_G: {
-                        onToggleFlag(message);
+                        setFlag(selection, Flag.FLAGGED, !message.flagged);
                         return true;
                     }
                     case KeyEvent.KEYCODE_M: {
-                        onMove(message);
+                        onMove(selection);
                         return true;
                     }
                     case KeyEvent.KEYCODE_V: {
-                        onArchive(message);
+                        onArchive(selection);
                         return true;
                     }
                     case KeyEvent.KEYCODE_Y: {
-                        onCopy(message);
+                        onCopy(selection);
                         return true;
                     }
                     case KeyEvent.KEYCODE_Z: {
-                        onToggleRead(message);
+                        setFlag(selection, Flag.SEEN, !message.read);
                         return true;
                     }
                     }
@@ -998,7 +1070,7 @@ public class MessageList
             MessageReference ref = message.message.makeMessageReference();
             Log.i(K9.LOG_TAG, "MessageList sending message " + ref);
 
-            MessageView.actionView(this, ref, messageRefs);
+            MessageView.actionView(this, ref, messageRefs, getIntent());
         }
 
         /*
@@ -1093,142 +1165,54 @@ public class MessageList
         reSort();
     }
 
-    private void onDelete(MessageInfoHolder holder, int position) {
-        mAdapter.removeMessage(holder);
-        mController.deleteMessages(new Message[] { holder.message }, null);
-    }
-
-    private void onMove(MessageInfoHolder holder) {
-        if (!mController.isMoveCapable(holder.message.getFolder().getAccount())) {
-            return;
+    /**
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onDelete(final List<MessageInfoHolder> holders) {
+        final List<Message> messagesToRemove = new ArrayList<Message>();
+        for (MessageInfoHolder holder : holders) {
+            messagesToRemove.add(holder.message);
         }
-
-        if (!mController.isMoveCapable(holder.message)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        final Account account = holder.message.getFolder().getAccount();
-
-        Intent intent = new Intent(this, ChooseFolder.class);
-        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, account.getUuid());
-        intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, holder.folder.name);
-        intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, account.getLastSelectedFolderName());
-        intent.putExtra(ChooseFolder.EXTRA_MESSAGE, holder.message.makeMessageReference());
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_MOVE);
-    }
-
-    private void onArchive(MessageInfoHolder holder) {
-
-        if (!mController.isMoveCapable(holder.message)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        onMoveChosen(holder, holder.message.getFolder().getAccount().getArchiveFolderName());
-    }
-
-    private void onSpam(MessageInfoHolder holder) {
-
-        if (!mController.isMoveCapable(holder.message)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        onMoveChosen(holder, holder.message.getFolder().getAccount().getSpamFolderName());
-    }
-
-    private void onCopy(MessageInfoHolder holder) {
-        if (!mController.isCopyCapable(holder.message.getFolder().getAccount())) {
-            return;
-        }
-
-        if (!mController.isCopyCapable(holder.message)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        final Account account = holder.message.getFolder().getAccount();
-
-        Intent intent = new Intent(this, ChooseFolder.class);
-        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, account.getUuid());
-        intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, holder.folder.name);
-        intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, account.getLastSelectedFolderName());
-        intent.putExtra(ChooseFolder.EXTRA_MESSAGE, holder.message.makeMessageReference());
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_COPY);
+        mHandler.removeMessages(holders);
+        mController.deleteMessages(messagesToRemove.toArray(EMPTY_MESSAGE_ARRAY), null);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK)
+        if (resultCode != RESULT_OK) {
             return;
+        }
 
         switch (requestCode) {
         case ACTIVITY_CHOOSE_FOLDER_MOVE:
         case ACTIVITY_CHOOSE_FOLDER_COPY: {
-            if (data == null)
+            if (data == null) {
                 return;
+            }
 
             final String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
-            final MessageReference ref = data.getParcelableExtra(ChooseFolder.EXTRA_MESSAGE);
-            final MessageInfoHolder m = mAdapter.getMessage(ref);
 
-            if ((destFolderName != null) && (m != null)) {
-                final Account account = m.message.getFolder().getAccount();
+            if (destFolderName != null) {
+                final List<MessageInfoHolder> holders = mActiveMessages;
 
+                mActiveMessages = null; // don't need it any more
+
+                final Account account = holders.get(0).message.getFolder().getAccount();
                 account.setLastSelectedFolderName(destFolderName);
 
                 switch (requestCode) {
                 case ACTIVITY_CHOOSE_FOLDER_MOVE:
-                    onMoveChosen(m, destFolderName);
+                    move(holders, destFolderName);
                     break;
 
                 case ACTIVITY_CHOOSE_FOLDER_COPY:
-                    onCopyChosen(m, destFolderName);
+                    copy(holders, destFolderName);
                     break;
                 }
             }
             break;
         }
-        case ACTIVITY_CHOOSE_FOLDER_MOVE_BATCH:
-        case ACTIVITY_CHOOSE_FOLDER_COPY_BATCH: {
-            final String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
-            final String accountUuid = data.getStringExtra(ChooseFolder.EXTRA_ACCOUNT);
-            final Account account = Preferences.getPreferences(this).getAccount(accountUuid);
-
-            account.setLastSelectedFolderName(destFolderName);
-
-            switch (requestCode) {
-            case ACTIVITY_CHOOSE_FOLDER_MOVE_BATCH:
-                onMoveChosenBatch(destFolderName);
-                break;
-
-            case ACTIVITY_CHOOSE_FOLDER_COPY_BATCH:
-                onCopyChosenBatch(destFolderName);
-                break;
-            }
-        }
-        }
-    }
-
-    private void onMoveChosen(MessageInfoHolder holder, String folderName) {
-        if (mController.isMoveCapable(holder.message.getFolder().getAccount()) && folderName != null) {
-            if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) {
-                return;
-            }
-            mAdapter.removeMessage(holder);
-            mController.moveMessage(holder.message.getFolder().getAccount(), holder.message.getFolder().getName(), holder.message, folderName, null);
-        }
-    }
-
-    private void onCopyChosen(MessageInfoHolder holder, String folderName) {
-        if (mController.isCopyCapable(holder.message.getFolder().getAccount()) && folderName != null) {
-            mController.copyMessage(holder.message.getFolder().getAccount(),
-                                    holder.message.getFolder().getName(), holder.message, folderName, null);
         }
     }
 
@@ -1245,7 +1229,26 @@ public class MessageList
     }
 
     private void onMarkAllAsRead(final Account account, final String folder) {
-        showDialog(DIALOG_MARK_ALL_AS_READ);
+        if (K9.confirmMarkAllAsRead()) {
+            showDialog(DIALOG_MARK_ALL_AS_READ);
+        } else {
+            markAllAsRead();
+        }
+    }
+
+    private void markAllAsRead() {
+        try {
+            mController.markAllMessagesRead(mAccount, mCurrentFolder.name);
+
+            synchronized (mAdapter.messages) {
+                for (MessageInfoHolder holder : mAdapter.messages) {
+                    holder.read = true;
+                }
+            }
+            mHandler.sortMessages();
+        } catch (Exception e) {
+            // Ignore
+        }
     }
 
     private void onExpunge(final Account account, String folderName) {
@@ -1256,14 +1259,53 @@ public class MessageList
     public Dialog onCreateDialog(int id) {
         switch (id) {
         case DIALOG_MARK_ALL_AS_READ:
-            return createMarkAllAsReadDialog();
+            return ConfirmationDialog.create(this, id,
+                                             R.string.mark_all_as_read_dlg_title,
+                                             getString(R.string.mark_all_as_read_dlg_instructions_fmt,
+                                                     mCurrentFolder.displayName),
+                                             R.string.okay_action,
+                                             R.string.cancel_action,
+            new Runnable() {
+                @Override
+                public void run() {
+                    markAllAsRead();
+                }
+            });
+        case R.id.dialog_confirm_spam:
+            return ConfirmationDialog.create(this, id,
+                                             R.string.dialog_confirm_spam_title,
+                                             "" /* text is refreshed by #onPrepareDialog(int, Dialog) below */,
+                                             R.string.dialog_confirm_spam_confirm_button,
+                                             R.string.dialog_confirm_spam_cancel_button,
+            new Runnable() {
+                @Override
+                public void run() {
+                    onSpamConfirmed(mActiveMessages);
+                    // No further need for this reference
+                    mActiveMessages = null;
+                }
+            }, new Runnable() {
+                @Override
+                public void run() {
+                    // event for cancel, we don't need this reference any more
+                    mActiveMessages = null;
+                }
+            });
         }
 
         return super.onCreateDialog(id);
     }
 
+    /*
+     * (non-Javadoc)
+     *
+     * Android happens to invoke this method even if the given dialog is not
+     * shown (eg. a dismissed dialog) as part of the automatic activity
+     * reloading following a configuration change (orientation, keyboard,
+     * locale, etc.).
+     */
     @Override
-    public void onPrepareDialog(int id, Dialog dialog) {
+    public void onPrepareDialog(final int id, final Dialog dialog) {
         switch (id) {
         case DIALOG_MARK_ALL_AS_READ: {
             if (mCurrentFolder != null) {
@@ -1272,43 +1314,25 @@ public class MessageList
             }
             break;
         }
+        case R.id.dialog_confirm_spam: {
+            // mActiveMessages can be null if Android restarts the activity
+            // while this dialog is not actually shown (but was displayed at
+            // least once)
+            if (mActiveMessages != null) {
+                final int selectionSize = mActiveMessages.size();
+                final String message;
+                message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize,
+                          Integer.valueOf(selectionSize));
+                ((AlertDialog) dialog).setMessage(message);
+            }
+            break;
+        }
         default: {
             super.onPrepareDialog(id, dialog);
         }
         }
     }
 
-    private Dialog createMarkAllAsReadDialog() {
-        return new AlertDialog.Builder(this)
-               .setTitle(R.string.mark_all_as_read_dlg_title)
-               .setMessage(getString(R.string.mark_all_as_read_dlg_instructions_fmt,
-                                     mCurrentFolder.displayName))
-        .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_MARK_ALL_AS_READ);
-
-                try {
-                    mController.markAllMessagesRead(mAccount, mCurrentFolder.name);
-
-                    synchronized (mAdapter.messages) {
-                        for (MessageInfoHolder holder : mAdapter.messages) {
-                            holder.read = true;
-                        }
-                    }
-                    mHandler.sortMessages();
-                } catch (Exception e) {
-                    // Ignore
-                }
-            }
-        })
-        .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int whichButton) {
-                dismissDialog(DIALOG_MARK_ALL_AS_READ);
-            }
-        })
-               .create();
-    }
-
     private void onToggleRead(MessageInfoHolder holder) {
         mController.setFlag(holder.message.getFolder().getAccount(), holder.message.getFolder().getName(), new String[] { holder.uid }, Flag.SEEN, !holder.read);
         holder.read = !holder.read;
@@ -1328,6 +1352,7 @@ public class MessageList
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        final List<MessageInfoHolder> selection = getSelectionFromCheckboxes();
         int itemId = item.getItemId();
         switch (itemId) {
         case R.id.compose: {
@@ -1374,23 +1399,23 @@ public class MessageList
             return true;
         }
         case R.id.batch_delete_op: {
-            deleteSelected();
+            onDelete(selection);
             return true;
         }
         case R.id.batch_mark_read_op: {
-            flagSelected(Flag.SEEN, true);
+            setFlag(selection, Flag.SEEN, true);
             return true;
         }
         case R.id.batch_mark_unread_op: {
-            flagSelected(Flag.SEEN, false);
+            setFlag(selection, Flag.SEEN, false);
             return true;
         }
         case R.id.batch_flag_op: {
-            flagSelected(Flag.FLAGGED, true);
+            setFlag(selection, Flag.FLAGGED, true);
             return true;
         }
         case R.id.batch_unflag_op: {
-            flagSelected(Flag.FLAGGED, false);
+            setFlag(selection, Flag.FLAGGED, false);
             return true;
         }
         case R.id.app_settings: {
@@ -1437,19 +1462,19 @@ public class MessageList
             return true;
         }
         case R.id.batch_copy_op: {
-            onCopyBatch();
+            onCopy(selection);
             return true;
         }
         case R.id.batch_archive_op: {
-            onArchiveBatch();
+            onArchive(selection);
             return true;
         }
         case R.id.batch_spam_op: {
-            onSpamBatch();
+            onSpam(selection);
             return true;
         }
         case R.id.batch_move_op: {
-            onMoveBatch();
+            onMove(selection);
             return true;
         }
         case R.id.expunge: {
@@ -1539,28 +1564,26 @@ public class MessageList
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        MessageInfoHolder holder = mSelectedMessage;
+        final MessageInfoHolder holder = mSelectedMessage == null ? (MessageInfoHolder) mAdapter.getItem(info.position) : mSelectedMessage;
         // don't need this anymore
         mSelectedMessage = null;
-        if (holder == null) {
-            holder = (MessageInfoHolder) mAdapter.getItem(info.position);
-        }
 
+        final List<MessageInfoHolder> selection = getSelectionFromMessage(holder);
         switch (item.getItemId()) {
         case R.id.open: {
             onOpenMessage(holder);
             break;
         }
         case R.id.select: {
-            setSelected(holder, true);
+            setSelected(selection, true);
             break;
         }
         case R.id.deselect: {
-            setSelected(holder, false);
+            setSelected(selection, false);
             break;
         }
         case R.id.delete: {
-            onDelete(holder, info.position);
+            onDelete(selection);
             break;
         }
         case R.id.reply: {
@@ -1589,19 +1612,19 @@ public class MessageList
             break;
         }
         case R.id.archive: {
-            onArchive(holder);
+            onArchive(selection);
             break;
         }
         case R.id.spam: {
-            onSpam(holder);
+            onSpam(selection);
             break;
         }
         case R.id.move: {
-            onMove(holder);
+            onMove(selection);
             break;
         }
         case R.id.copy: {
-            onCopy(holder);
+            onCopy(selection);
             break;
         }
         case R.id.send_alternate: {
@@ -1610,7 +1633,7 @@ public class MessageList
         }
         case R.id.same_sender: {
             MessageList.actionHandle(MessageList.this,
-                                     "From " + holder.sender, holder.senderAddress, true,
+                                     "From " + holder.sender, holder.senderAddress, false,
                                      null, null);
             break;
         }
@@ -1775,7 +1798,7 @@ public class MessageList
                 if (holder == null) {
                     Log.w(K9.LOG_TAG, "Got callback to remove non-existent message with UID " + message.getUid());
                 } else {
-                    removeMessage(holder);
+                    removeMessages(Collections.singletonList(holder));
                 }
             }
 
@@ -1815,7 +1838,7 @@ public class MessageList
             public void listLocalMessagesRemoveMessage(Account account, String folder, Message message) {
                 MessageInfoHolder holder = getMessage(message);
                 if (holder != null) {
-                    removeMessage(holder);
+                    removeMessages(Collections.singletonList(holder));
                 }
             }
 
@@ -1889,22 +1912,18 @@ public class MessageList
                             mSelectedCount--;
                             toggleBatchButtons();
                         }
-                        mAdapter.removeMessage(holder);
+                        mAdapter.removeMessages(Collections.singletonList(holder));
                     }
                 }
             }
         }
 
+        /**
+         * @param holders
+         *            Never {@code null}.
+         */
         public void removeMessages(List<MessageInfoHolder> holders) {
-            if (holders != null) {
-                mHandler.removeMessage(holders);
-            }
-        }
-
-        public void removeMessage(MessageInfoHolder holder) {
-            List<MessageInfoHolder> messages = new ArrayList<MessageInfoHolder>();
-            messages.add(holder);
-            removeMessages(messages);
+            mHandler.removeMessages(holders);
         }
 
         private void addOrUpdateMessage(Account account, String folderName, Message message, boolean verifyAgainstSearch) {
@@ -2023,6 +2042,7 @@ public class MessageList
         }
 
         private final OnClickListener flagClickListener = new OnClickListener() {
+            @Override
             public void onClick(View v) {
                 // Perform action on clicks
                 MessageInfoHolder message = (MessageInfoHolder) getItem((Integer)v.getTag());
@@ -2136,13 +2156,14 @@ public class MessageList
                     holder.preview.setText(noSender, TextView.BufferType.SPANNABLE);
                     Spannable str = (Spannable) holder.preview.getText();
 
-                    ColorStateList color = holder.subject.getTextColors();
-                    ColorStateList linkColor = holder.subject.getLinkTextColors();
-                    str.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, mFontSizes.getMessageListSender(), color, linkColor),
+                    str.setSpan(new StyleSpan(Typeface.NORMAL),
                                 0,
                                 noSender.length(),
-                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                               );
+                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    str.setSpan(K9.createAbsoluteSizeSpan(mFontSizes.getMessageListSender()),
+                                0,
+                                noSender.length(),
+                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 } else {
                     holder.from.setText(noSender);
                     holder.from.setTypeface(null, Typeface.NORMAL);
@@ -2224,13 +2245,20 @@ public class MessageList
                 Spannable str = (Spannable)holder.preview.getText();
 
                 // Create a span section for the sender, and assign the correct font size and weight.
-                ColorStateList color = holder.subject.getTextColors();
-                ColorStateList linkColor = holder.subject.getLinkTextColors();
-                str.setSpan(new TextAppearanceSpan(null, senderTypeface, mFontSizes.getMessageListSender(), color, linkColor),
+                str.setSpan(new StyleSpan(senderTypeface),
                             0,
                             message.sender.length() + 1,
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-                           );
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                str.setSpan(K9.createAbsoluteSizeSpan(mFontSizes.getMessageListSender()),
+                            0,
+                            message.sender.length() + 1,
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                // set span for preview message.
+                str.setSpan(new ForegroundColorSpan(Color.rgb(128, 128, 128)), // How do I can specify the android.R.attr.textColorTertiary
+                            message.sender.length() + 1,
+                            str.length(),
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             } else {
                 holder.from.setText(new SpannableStringBuilder(recipientSigil(message)).append(message.sender));
 
@@ -2502,12 +2530,15 @@ public class MessageList
         mHandler.sortMessages();
     }
 
+    @Override
     public void onAnimationEnd(Animation animation) {
     }
 
+    @Override
     public void onAnimationRepeat(Animation animation) {
     }
 
+    @Override
     public void onAnimationStart(Animation animation) {
     }
 
@@ -2525,171 +2556,290 @@ public class MessageList
         toggleBatchButtons();
     }
 
-    private void setSelected(MessageInfoHolder holder, boolean newState) {
-        if (holder.selected != newState) {
-            holder.selected = newState;
-            mSelectedCount += (newState ? 1 : -1);
+    private void setSelected(final List<MessageInfoHolder> holders, final boolean newState) {
+        for (final MessageInfoHolder holder : holders) {
+            if (holder.selected != newState) {
+                holder.selected = newState;
+                mSelectedCount += (newState ? 1 : -1);
+            }
         }
         mAdapter.notifyDataSetChanged();
         toggleBatchButtons();
     }
 
-    private void flagSelected(Flag flag, boolean newState) {
-        List<Message> messageList = new ArrayList<Message>();
-        synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
-                if (holder.selected) {
-                    messageList.add(holder.message);
-                    if (flag == Flag.SEEN) {
-                        holder.read = newState;
-                    } else if (flag == Flag.FLAGGED) {
-                        holder.flagged = newState;
-                    }
-                }
+    /**
+     * @param holders
+     *            Messages to update. Never {@code null}.
+     * @param flag
+     *            Flag to be updated on the specified messages. Never
+     *            {@code null}.
+     * @param newState
+     *            State to set for the given flag.
+     */
+    private void setFlag(final List<MessageInfoHolder> holders, final Flag flag, final boolean newState) {
+        if (holders.isEmpty()) {
+            return;
+        }
+        final Message[] messageList = new Message[holders.size()];
+        int i = 0;
+        for (final Iterator<MessageInfoHolder> iterator = holders.iterator(); iterator.hasNext(); i++) {
+            final MessageInfoHolder holder = iterator.next();
+            messageList[i] = holder.message;
+            if (flag == Flag.SEEN) {
+                holder.read = newState;
+            } else if (flag == Flag.FLAGGED) {
+                holder.flagged = newState;
             }
         }
-        mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), flag, newState);
+        mController.setFlag(messageList, flag, newState);
         mHandler.sortMessages();
     }
 
-    private void deleteSelected() {
-        List<Message> messageList = new ArrayList<Message>();
-        List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
-        synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
-                if (holder.selected) {
-                    removeHolderList.add(holder);
-                    messageList.add(holder.message);
-                }
-            }
-        }
-        mAdapter.removeMessages(removeHolderList);
-
-        mController.deleteMessages(messageList.toArray(EMPTY_MESSAGE_ARRAY), null);
-        mSelectedCount = 0;
-        toggleBatchButtons();
-    }
-
-    private void onMoveBatch() {
-        if (!mController.isMoveCapable(mAccount)) {
+    /**
+     * Display the message move activity.
+     *
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onMove(final List<MessageInfoHolder> holders) {
+        if (!checkCopyOrMovePossible(holders, FolderOperation.MOVE)) {
             return;
         }
 
-        synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
-                if (holder.selected) {
-                    Message message = holder.message;
-                    if (!mController.isMoveCapable(message)) {
-                        Toast toast = Toast.makeText(this,
-                                                     R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-                        toast.show();
-                        return;
-                    }
-                }
-            }
+        final Folder folder = holders.size() == 1 ? holders.get(0).message.getFolder() : mCurrentFolder.folder;
+        displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_MOVE, folder, holders);
+    }
+
+    /**
+     * Display the message copy activity.
+     *
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onCopy(final List<MessageInfoHolder> holders) {
+        if (!checkCopyOrMovePossible(holders, FolderOperation.COPY)) {
+            return;
         }
 
-        final Folder folder = mCurrentFolder.folder;
+        final Folder folder = holders.size() == 1 ? holders.get(0).message.getFolder() : mCurrentFolder.folder;
+        displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_COPY, folder, holders);
+    }
+
+    /**
+     * Helper method to manage the invocation of
+     * {@link #startActivityForResult(Intent, int)} for a folder operation
+     * ({@link ChooseFolder} activity), while saving a list of associated
+     * messages.
+     *
+     * @param requestCode
+     *            If >= 0, this code will be returned in onActivityResult() when
+     *            the activity exits.
+     * @param folder
+     *            Never {@code null}.
+     * @param holders
+     *            Messages to be affected by the folder operation. Never
+     *            {@code null}.
+     * @see #startActivityForResult(Intent, int)
+     */
+    private void displayFolderChoice(final int requestCode, final Folder folder, final List<MessageInfoHolder> holders) {
         final Intent intent = new Intent(this, ChooseFolder.class);
-        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount.getUuid());
+        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, folder.getAccount().getUuid());
         intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, folder.getName());
         intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, folder.getAccount().getLastSelectedFolderName());
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_MOVE_BATCH);
+        // remember the selected messages for #onActivityResult
+        mActiveMessages = holders;
+        startActivityForResult(intent, requestCode);
     }
 
-    private void onMoveChosenBatch(String folderName) {
-        if (!mController.isMoveCapable(mAccount)) {
-            return;
-        }
-        List<Message> messageList = new ArrayList<Message>();
-
-        List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
-        synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
-                if (holder.selected) {
-                    Message message = holder.message;
-                    if (!mController.isMoveCapable(message)) {
-                        Toast toast = Toast.makeText(this,
-                                                     R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-                        toast.show();
-                        return;
-                    }
-                    messageList.add(holder.message);
-                    removeHolderList.add(holder);
-                }
-            }
-        }
-        mAdapter.removeMessages(removeHolderList);
-
-        mController.moveMessages(mAccount, mCurrentFolder.name, messageList.toArray(EMPTY_MESSAGE_ARRAY), folderName, null);
-        mSelectedCount = 0;
-        toggleBatchButtons();
-    }
-
-    private void onArchiveBatch() {
-        String folderName = mAccount.getArchiveFolderName();
+    /**
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onArchive(final List<MessageInfoHolder> holders) {
+        final String folderName = holders.get(0).message.getFolder().getAccount().getArchiveFolderName();
         if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) {
             return;
         }
-        onMoveChosenBatch(folderName);
+        // TODO one should separate messages by account and call move afterwards
+        // (because each account might have a specific Archive folder name)
+        move(holders, folderName);
     }
 
-    private void onSpamBatch() {
-        String folderName = mAccount.getSpamFolderName();
+    /**
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onSpam(final List<MessageInfoHolder> holders) {
+        if (K9.confirmSpam()) {
+            // remember the message selection for #onCreateDialog(int)
+            mActiveMessages = holders;
+            showDialog(R.id.dialog_confirm_spam);
+        } else {
+            onSpamConfirmed(holders);
+        }
+    }
+
+    /**
+     * @param holders
+     *            Never {@code null}.
+     */
+    private void onSpamConfirmed(final List<MessageInfoHolder> holders) {
+        final String folderName = holders.get(0).message.getFolder().getAccount().getSpamFolderName();
         if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) {
             return;
         }
-        onMoveChosenBatch(folderName);
+        // TODO one should separate messages by account and call move afterwards
+        // (because each account might have a specific Spam folder name)
+        move(holders, folderName);
     }
 
-    private void onCopyBatch() {
-        if (!mController.isCopyCapable(mAccount)) {
-            return;
-        }
+    private static enum FolderOperation {
+        COPY, MOVE
+    }
 
+    /**
+     * Display an Toast message if any message isn't synchronized
+     *
+     * @param holders
+     *            Never <code>null</code>.
+     * @param operation
+     *            Never {@code null}.
+     *
+     * @return <code>true</code> if operation is possible
+     */
+    private boolean checkCopyOrMovePossible(final List<MessageInfoHolder> holders, final FolderOperation operation) {
+        if (holders.isEmpty()) {
+            return false;
+        }
+        boolean first = true;
+        for (final MessageInfoHolder holder : holders) {
+            final Message message = holder.message;
+            if (first) {
+                first = false;
+                // account check
+                final Account account = message.getFolder().getAccount();
+                if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(account)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(account))) {
+                    return false;
+                }
+            }
+            // message check
+            if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
+                final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
+                                                   Toast.LENGTH_LONG);
+                toast.show();
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Helper method to get a List of message ready to be processed. This implementation will return a list containing the sole argument.
+     *
+     * @param holder Never {@code null}.
+     * @return Never {@code null}.
+     */
+    private List<MessageInfoHolder> getSelectionFromMessage(final MessageInfoHolder holder) {
+        final List<MessageInfoHolder> selection = Collections.singletonList(holder);
+        return selection;
+    }
+
+    /**
+     * Helper method to get a List of message ready to be processed. This implementation will iterate over messages and choose the checked ones.
+     *
+     * @return Never {@code null}.
+     */
+    private List<MessageInfoHolder> getSelectionFromCheckboxes() {
+        final List<MessageInfoHolder> selection = new ArrayList<MessageInfoHolder>();
         synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
+            for (final MessageInfoHolder holder : mAdapter.messages) {
                 if (holder.selected) {
-                    Message message = holder.message;
-                    if (!mController.isCopyCapable(message)) {
-                        Toast toast = Toast.makeText(this,
-                                                     R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-                        toast.show();
-                        return;
-                    }
+                    selection.add(holder);
                 }
             }
         }
-
-        final Folder folder = mCurrentFolder.folder;
-        final Intent intent = new Intent(this, ChooseFolder.class);
-        intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount.getUuid());
-        intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, folder.getName());
-        intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, folder.getAccount().getLastSelectedFolderName());
-        startActivityForResult(intent, ACTIVITY_CHOOSE_FOLDER_COPY_BATCH);
+        return selection;
     }
 
-    private void onCopyChosenBatch(String folderName) {
-        if (!mController.isCopyCapable(mAccount)) {
+    /**
+     * Copy the specified messages to the specified folder.
+     *
+     * @param holders Never {@code null}.
+     * @param destination Never {@code null}.
+     */
+    private void copy(final List<MessageInfoHolder> holders, final String destination) {
+        copyOrMove(holders, destination, FolderOperation.COPY);
+    }
+
+    /**
+     * Move the specified messages to the specified folder.
+     *
+     * @param holders Never {@code null}.
+     * @param destination Never {@code null}.
+     */
+    private void move(final List<MessageInfoHolder> holders, final String destination) {
+        copyOrMove(holders, destination, FolderOperation.MOVE);
+    }
+
+    /**
+     * The underlying implementation for {@link #copy(List, String)} and
+     * {@link #move(List, String)}. This method was added mainly because those 2
+     * methods share common behavior.
+     *
+     * @param holders
+     *            Never {@code null}.
+     * @param destination
+     *            Never {@code null}.
+     * @param operation
+     *            Never {@code null}.
+     */
+    private void copyOrMove(final List<MessageInfoHolder> holders, final String destination, final FolderOperation operation) {
+        if (K9.FOLDER_NONE.equalsIgnoreCase(destination)) {
             return;
         }
 
-        List<Message> messageList = new ArrayList<Message>();
-        synchronized (mAdapter.messages) {
-            for (MessageInfoHolder holder : mAdapter.messages) {
-                if (holder.selected) {
-                    Message message = holder.message;
-                    if (!mController.isCopyCapable(message)) {
-                        Toast toast = Toast.makeText(this,
-                                                     R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-                        toast.show();
-                        return;
-                    }
-                    messageList.add(holder.message);
+        boolean first = true;
+        Account account = null;
+        String folderName = null;
+
+        final List<Message> messages = new ArrayList<Message>(holders.size());
+
+        for (final MessageInfoHolder holder : holders) {
+            final Message message = holder.message;
+            if (first) {
+                first = false;
+                folderName = message.getFolder().getName();
+                account = message.getFolder().getAccount();
+                if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(account)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(account))) {
+                    // account is not copy/move capable
+                    return;
                 }
+            } else if (!account.equals(message.getFolder().getAccount())
+                       || !folderName.equals(message.getFolder().getName())) {
+                // make sure all messages come from the same account/folder?
+                return;
             }
+            if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
+                final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
+                                                   Toast.LENGTH_LONG);
+                toast.show();
+
+                // XXX return meaningful error value?
+
+                // message isn't synchronized
+                return;
+            }
+            messages.add(message);
+        }
+
+        if (operation == FolderOperation.MOVE) {
+            mController.moveMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination,
+                                     null);
+            mHandler.removeMessages(holders);
+        } else {
+            mController.copyMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination,
+                                     null);
         }
-        mController.copyMessages(mAccount, mCurrentFolder.name, messageList.toArray(EMPTY_MESSAGE_ARRAY), folderName, null);
     }
 
     protected void onAccountUnavailable() {
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index b937a66ab..d10ee7186 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1,10 +1,10 @@
 package com.fsck.k9.activity;
 
-import android.app.AlertDialog;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningTaskInfo;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.net.Uri;
@@ -19,23 +19,57 @@ import com.fsck.k9.*;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.crypto.PgpData;
+import com.fsck.k9.helper.FileBrowserHelper;
+import com.fsck.k9.helper.FileBrowserHelper.FileBrowserFailOverCallback;
 import com.fsck.k9.mail.*;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.view.AttachmentView;
 import com.fsck.k9.view.ToggleScrollView;
 import com.fsck.k9.view.SingleMessageView;
+import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
 
+import java.io.File;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.*;
 
 public class MessageView extends K9Activity implements OnClickListener {
     private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
     private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
+    private static final String EXTRA_ORIGINATING_INTENT = "com.fsck.k9.MessageView_originatingIntent";
     private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next";
     private static final String SHOW_PICTURES = "showPictures";
     private static final String STATE_PGP_DATA = "pgpData";
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
+    private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
 
+    /**
+     * Whether parent class have the onBackPressed() method (with no argument)
+     */
+    private static final boolean HAS_SUPER_ON_BACK_METHOD;
+    static {
+        boolean hasOnBackMethod;
+        try {
+            final Class <? super MessageView > superClass = MessageView.class.getSuperclass();
+            final Method method = superClass.getMethod("onBackPressed", new Class[] {});
+            hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC;
+        } catch (final SecurityException e) {
+            if (K9.DEBUG) {
+                Log.v(K9.LOG_TAG, "Security exception while checking for 'onBackPressed' method", e);
+            }
+            hasOnBackMethod = false;
+        } catch (final NoSuchMethodException e) {
+            hasOnBackMethod = false;
+        }
+        HAS_SUPER_ON_BACK_METHOD = hasOnBackMethod;
+    }
+
+    /**
+     * If user opt-in for the "Manage BACK button", we have to remember how to get back to the
+     * originating activity (just recreating a new Intent could lose the calling activity state)
+     */
+    private Intent mCreatorIntent;
 
     private SingleMessageView mMessageView;
 
@@ -55,7 +89,7 @@ public class MessageView extends K9Activity implements OnClickListener {
     private Message mMessage;
     private static final int PREVIOUS = 1;
     private static final int NEXT = 2;
-    private int mLastDirection = PREVIOUS;
+    private int mLastDirection = (K9.messageViewShowNext()) ? NEXT : PREVIOUS;
     private MessagingController mController = MessagingController.getInstance(getApplication());
     private MessageReference mNextMessage = null;
     private MessageReference mPreviousMessage = null;
@@ -63,6 +97,18 @@ public class MessageView extends K9Activity implements OnClickListener {
     private MessageViewHandler mHandler = new MessageViewHandler();
     private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
 
+    /** this variable is used to save the calling AttachmentView
+     *  until the onActivityResult is called.
+     *  => with this reference we can identity the caller
+     */
+    private AttachmentView attachmentTmpStore;
+
+    /**
+     * Used to temporarily store the destination folder for refile operations if a confirmation
+     * dialog is shown.
+     */
+    private String mDstFolder;
+
     private final class StorageListenerImplementation implements StorageManager.StorageListener {
         @Override
         public void onUnmount(String providerId) {
@@ -78,7 +124,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         }
 
         @Override
-        public void onMount(String providerId) {} // no-op
+        public void onMount(String providerId) { /* no-op */ }
     }
 
 
@@ -113,6 +159,15 @@ public class MessageView extends K9Activity implements OnClickListener {
 
     @Override
     public boolean onKeyDown(final int keyCode, final KeyEvent event) {
+        if (
+            // XXX TODO - when we go to android 2.0, uncomment this
+            // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR &&
+            keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
+            // Take care of calling this method on earlier versions of
+            // the platform where it doesn't exist.
+            onBackPressed();
+            return true;
+        }
         switch (keyCode) {
         case KeyEvent.KEYCODE_VOLUME_UP: {
             if (K9.useVolumeKeysForNavigationEnabled()) {
@@ -215,6 +270,34 @@ public class MessageView extends K9Activity implements OnClickListener {
         return super.onKeyUp(keyCode, event);
     }
 
+    @Override
+    public void onBackPressed() {
+        // This will be called either automatically for you on 2.0
+        // or later, or by the code above on earlier versions of the
+        // platform.
+        if (K9.manageBack()) {
+            final ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+            // retrieve the current+previous tasks
+            final List<RunningTaskInfo> runningTasks = activityManager.getRunningTasks(2);
+            final RunningTaskInfo previousTask = runningTasks.get(1);
+            final String originatingActivity = mCreatorIntent.getComponent().getClassName();
+            if (originatingActivity.equals(previousTask.topActivity.getClassName())) {
+                // we can safely just finish ourself since the most recent task matches our creator
+                // this enable us not to worry about restoring the state of our creator
+            } else {
+                // the previous task top activity doesn't match our creator (previous task is from
+                // another app and user used long-pressed-HOME to display MessageView)
+                // launching our creator
+                startActivity(mCreatorIntent);
+            }
+            finish();
+        } else if (HAS_SUPER_ON_BACK_METHOD) {
+            super.onBackPressed();
+        } else {
+            finish();
+        }
+    }
+
     class MessageViewHandler extends Handler {
 
         public void progress(final boolean progress) {
@@ -266,21 +349,29 @@ public class MessageView extends K9Activity implements OnClickListener {
 
     }
 
-
-    public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences) {
-        actionView(context, messRef, messReferences, null);
-    }
-
-    public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, Bundle extras) {
+    /**
+     * @param context
+     * @param messRef
+     * @param messReferences
+     * @param originatingIntent
+     *         The intent that allow us to get back to the calling screen, for when the 'Manage
+     *         "Back" button' option is enabled. Never {@code null}.
+     */
+    public static void actionView(Context context, MessageReference messRef,
+            ArrayList<MessageReference> messReferences, final Intent originatingIntent) {
         Intent i = new Intent(context, MessageView.class);
         i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef);
         i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences);
-        if (extras != null) {
-            i.putExtras(extras);
-        }
+        i.putExtra(EXTRA_ORIGINATING_INTENT, originatingIntent);
+        i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(i);
     }
 
+    @Override
+    protected void onNewIntent(final Intent intent) {
+        mCreatorIntent = intent.getParcelableExtra(EXTRA_ORIGINATING_INTENT);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle, false);
@@ -291,10 +382,39 @@ public class MessageView extends K9Activity implements OnClickListener {
         mTopView = mToggleScrollView = (ToggleScrollView) findViewById(R.id.top_view);
         mMessageView = (SingleMessageView) findViewById(R.id.message_view);
 
+        //set a callback for the attachment view. With this callback the attachmentview
+        //request the start of a filebrowser activity.
+        mMessageView.setAttachmentCallback(new AttachmentFileDownloadCallback() {
+
+            @Override
+            public void showFileBrowser(final AttachmentView caller) {
+                FileBrowserHelper.getInstance()
+                .showFileBrowserActivity(MessageView.this,
+                                         null,
+                                         MessageView.ACTIVITY_CHOOSE_DIRECTORY,
+                                         callback);
+                attachmentTmpStore = caller;
+            }
+            FileBrowserFailOverCallback callback = new FileBrowserFailOverCallback() {
+
+                @Override
+                public void onPathEntered(String path) {
+                    attachmentTmpStore.writeFile(new File(path));
+                }
+
+                @Override
+                public void onCancel() {
+                    // canceled, do nothing
+                }
+            };
+        });
         mMessageView.initialize(this);
 
         setTitle("");
-        Intent intent = getIntent();
+        final Intent intent = getIntent();
+
+        mCreatorIntent = getIntent().getParcelableExtra(EXTRA_ORIGINATING_INTENT);
+
         Uri uri = intent.getData();
         if (icicle != null) {
             mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE);
@@ -307,7 +427,7 @@ public class MessageView extends K9Activity implements OnClickListener {
             } else {
                 List<String> segmentList = uri.getPathSegments();
                 if (segmentList.size() != 3) {
-                    //TODO: Use ressource to externalize message
+                    //TODO: Use resource to externalize message
                     Toast.makeText(this, "Invalid intent uri: " + uri.toString(), Toast.LENGTH_LONG).show();
                     return;
                 }
@@ -323,7 +443,7 @@ public class MessageView extends K9Activity implements OnClickListener {
                     }
                 }
                 if (!found) {
-                    //TODO: Use ressource to externalize message
+                    //TODO: Use resource to externalize message
                     Toast.makeText(this, "Invalid account id: " + accountId, Toast.LENGTH_LONG).show();
                     return;
                 }
@@ -563,32 +683,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         }
     }
 
-    /**
-     * @param id
-     * @return Never <code>null</code>
-     */
-    protected Dialog createConfirmDeleteDialog(final int id) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.dialog_confirm_delete_title);
-        builder.setMessage(R.string.dialog_confirm_delete_message);
-        builder.setPositiveButton(R.string.dialog_confirm_delete_confirm_button,
-        new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dismissDialog(id);
-                delete();
-            }
-        });
-        builder.setNegativeButton(R.string.dialog_confirm_delete_cancel_button,
-        new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dismissDialog(id);
-            }
-        });
-        return builder.create();
-    }
-
     private void delete() {
         if (mMessage != null) {
             // Disable the delete button after it's tapped (to try to prevent
@@ -609,17 +703,26 @@ public class MessageView extends K9Activity implements OnClickListener {
             toast.show();
             return;
         }
-        String srcFolder = mMessageReference.folderName;
-        Message messageToMove = mMessage;
+
         if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) {
             return;
         }
+
+        if (mAccount.getSpamFolderName().equals(dstFolder) && K9.confirmSpam()) {
+            mDstFolder = dstFolder;
+            showDialog(R.id.dialog_confirm_spam);
+        } else {
+            refileMessage(dstFolder);
+        }
+    }
+
+    private void refileMessage(String dstFolder) {
+        String srcFolder = mMessageReference.folderName;
+        Message messageToMove = mMessage;
         showNextMessageOrReturn();
         mController.moveMessage(mAccount, srcFolder, messageToMove, dstFolder, null);
     }
 
-
-
     private void showNextMessageOrReturn() {
         if (K9.messageViewReturnToList()) {
             finish();
@@ -725,6 +828,19 @@ public class MessageView extends K9Activity implements OnClickListener {
         if (resultCode != RESULT_OK)
             return;
         switch (requestCode) {
+        case ACTIVITY_CHOOSE_DIRECTORY:
+            if (resultCode == RESULT_OK && data != null) {
+                // obtain the filename
+                Uri fileUri = data.getData();
+                if (fileUri != null) {
+                    String filePath = fileUri.getPath();
+                    if (filePath != null) {
+                        attachmentTmpStore.writeFile(new File(filePath));
+                    }
+                }
+            }
+
+            break;
         case ACTIVITY_CHOOSE_FOLDER_MOVE:
         case ACTIVITY_CHOOSE_FOLDER_COPY:
             if (data == null)
@@ -787,7 +903,7 @@ public class MessageView extends K9Activity implements OnClickListener {
 
     private void onMarkAsUnread() {
         if (mMessage != null) {
-            mController.setFlag(mAccount, mMessageReference.folderName, new String[] { mMessage.getUid() }, Flag.SEEN, false);
+// (Issue 3319)            mController.setFlag(mAccount, mMessageReference.folderName, new String[] { mMessage.getUid() }, Flag.SEEN, false);
             try {
                 mMessage.setFlag(Flag.SEEN, false);
                 mMessageView.setHeaders(mMessage, mAccount);
@@ -944,7 +1060,30 @@ public class MessageView extends K9Activity implements OnClickListener {
     protected Dialog onCreateDialog(final int id) {
         switch (id) {
         case R.id.dialog_confirm_delete:
-            return createConfirmDeleteDialog(id);
+            return ConfirmationDialog.create(this, id,
+                                             R.string.dialog_confirm_delete_title,
+                                             R.string.dialog_confirm_delete_message,
+                                             R.string.dialog_confirm_delete_confirm_button,
+                                             R.string.dialog_confirm_delete_cancel_button,
+            new Runnable() {
+                @Override
+                public void run() {
+                    delete();
+                }
+            });
+        case R.id.dialog_confirm_spam:
+            return ConfirmationDialog.create(this, id,
+                                             R.string.dialog_confirm_spam_title,
+                                             getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, 1),
+                                             R.string.dialog_confirm_spam_confirm_button,
+                                             R.string.dialog_confirm_spam_cancel_button,
+            new Runnable() {
+                @Override
+                public void run() {
+                    refileMessage(mDstFolder);
+                    mDstFolder = null;
+                }
+            });
         case R.id.dialog_attachment_progress:
             ProgressDialog d = new ProgressDialog(this);
             d.setIndeterminate(true);
diff --git a/src/com/fsck/k9/activity/SearchModifier.java b/src/com/fsck/k9/activity/SearchModifier.java
index b23330c80..8b610ff6e 100644
--- a/src/com/fsck/k9/activity/SearchModifier.java
+++ b/src/com/fsck/k9/activity/SearchModifier.java
@@ -1,13 +1,14 @@
-/**
- *
- */
 package com.fsck.k9.activity;
 
 import com.fsck.k9.R;
 import com.fsck.k9.mail.Flag;
 
+/**
+ * This enum represents filtering parameters used by {@link com.fsck.k9.SearchAccount}.
+ */
 enum SearchModifier {
-    FLAGGED(R.string.flagged_modifier, new Flag[] { Flag.FLAGGED}, null), UNREAD(R.string.unread_modifier, null, new Flag[] { Flag.SEEN});
+    FLAGGED(R.string.flagged_modifier, new Flag[]{Flag.FLAGGED}, null),
+    UNREAD(R.string.unread_modifier, null, new Flag[]{Flag.SEEN});
 
     final int resId;
     final Flag[] requiredFlags;
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index e2877b989..9ca88f15d 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -19,6 +19,7 @@ import java.util.List;
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.Account.QuoteStyle;
+import com.fsck.k9.Account.ScrollButtons;
 import com.fsck.k9.K9;
 import com.fsck.k9.NotificationSetting;
 import com.fsck.k9.Preferences;
@@ -45,6 +46,8 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final int ACTIVITY_MANAGE_IDENTITIES = 2;
 
     private static final String PREFERENCE_SCREEN_COMPOSING = "composing";
+    private static final String PREFERENCE_SCREEN_INCOMING = "incoming_prefs";
+    private static final String PREFERENCE_SCREEN_PUSH_ADVANCED = "push_advanced";
 
     private static final String PREFERENCE_DESCRIPTION = "account_description";
     private static final String PREFERENCE_COMPOSITION = "composition";
@@ -85,8 +88,10 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_MESSAGE_SIZE = "account_autodownload_size";
     private static final String PREFERENCE_SAVE_ALL_HEADERS = "account_save_all_headers";
     private static final String PREFERENCE_MESSAGE_FORMAT = "message_format";
+    private static final String PREFERENCE_MESSAGE_READ_RECEIPT = "message_read_receipt";
     private static final String PREFERENCE_QUOTE_PREFIX = "account_quote_prefix";
     private static final String PREFERENCE_QUOTE_STYLE = "quote_style";
+    private static final String PREFERENCE_DEFAULT_QUOTED_TEXT_SHOWN = "default_quoted_text_shown";
     private static final String PREFERENCE_REPLY_AFTER_QUOTE = "reply_after_quote";
     private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions";
     private static final String PREFERENCE_CRYPTO_APP = "crypto_app";
@@ -104,6 +109,7 @@ public class AccountSettings extends K9PreferenceActivity {
 
 
     private Account mAccount;
+    private boolean mIsMoveCapable = false;
     private boolean mIsPushCapable = false;
     private boolean mIsExpungeCapable = false;
 
@@ -141,8 +147,10 @@ public class AccountSettings extends K9PreferenceActivity {
     private CheckBoxPreference mNotificationOpensUnread;
     private CheckBoxPreference mNotificationUnreadCount;
     private ListPreference mMessageFormat;
+    private CheckBoxPreference mMessageReadReceipt;
     private ListPreference mQuoteStyle;
     private EditTextPreference mAccountQuotePrefix;
+    private CheckBoxPreference mAccountDefaultQuotedTextShown;
     private CheckBoxPreference mReplyAfterQuote;
     private CheckBoxPreference mSyncRemoteDeletions;
     private CheckBoxPreference mSaveAllHeaders;
@@ -177,6 +185,7 @@ public class AccountSettings extends K9PreferenceActivity {
 
         try {
             final Store store = mAccount.getRemoteStore();
+            mIsMoveCapable = store.isMoveCapable();
             mIsPushCapable = store.isPushCapable();
             mIsExpungeCapable = store.isExpungeCapable();
         } catch (Exception e) {
@@ -210,6 +219,9 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
+        mMessageReadReceipt = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGE_READ_RECEIPT);
+        mMessageReadReceipt.setChecked(mAccount.isMessageReadReceiptAlways());
+
         mAccountQuotePrefix = (EditTextPreference) findPreference(PREFERENCE_QUOTE_PREFIX);
         mAccountQuotePrefix.setSummary(mAccount.getQuotePrefix());
         mAccountQuotePrefix.setText(mAccount.getQuotePrefix());
@@ -223,6 +235,9 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
+        mAccountDefaultQuotedTextShown = (CheckBoxPreference) findPreference(PREFERENCE_DEFAULT_QUOTED_TEXT_SHOWN);
+        mAccountDefaultQuotedTextShown.setChecked(mAccount.isDefaultQuotedTextShown());
+
         mReplyAfterQuote = (CheckBoxPreference) findPreference(PREFERENCE_REPLY_AFTER_QUOTE);
         mReplyAfterQuote.setChecked(mAccount.isReplyAfterQuote());
 
@@ -291,19 +306,6 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
-        mPushMode = (ListPreference) findPreference(PREFERENCE_PUSH_MODE);
-        mPushMode.setEnabled(mIsPushCapable);
-        mPushMode.setValue(mAccount.getFolderPushMode().name());
-        mPushMode.setSummary(mPushMode.getEntry());
-        mPushMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final String summary = newValue.toString();
-                int index = mPushMode.findIndexOfValue(summary);
-                mPushMode.setSummary(mPushMode.getEntries()[index]);
-                mPushMode.setValue(summary);
-                return false;
-            }
-        });
 
         mTargetMode = (ListPreference) findPreference(PREFERENCE_TARGET_MODE);
         mTargetMode.setValue(mAccount.getFolderTargetMode().name());
@@ -331,19 +333,24 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
+
         mExpungePolicy = (ListPreference) findPreference(PREFERENCE_EXPUNGE_POLICY);
-        mExpungePolicy.setEnabled(mIsExpungeCapable);
-        mExpungePolicy.setValue(mAccount.getExpungePolicy());
-        mExpungePolicy.setSummary(mExpungePolicy.getEntry());
-        mExpungePolicy.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final String summary = newValue.toString();
-                int index = mExpungePolicy.findIndexOfValue(summary);
-                mExpungePolicy.setSummary(mExpungePolicy.getEntries()[index]);
-                mExpungePolicy.setValue(summary);
-                return false;
-            }
-        });
+        if (mIsExpungeCapable) {
+	        mExpungePolicy.setValue(mAccount.getExpungePolicy());
+	        mExpungePolicy.setSummary(mExpungePolicy.getEntry());
+	        mExpungePolicy.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+	            public boolean onPreferenceChange(Preference preference, Object newValue) {
+	                final String summary = newValue.toString();
+	                int index = mExpungePolicy.findIndexOfValue(summary);
+	                mExpungePolicy.setSummary(mExpungePolicy.getEntries()[index]);
+	                mExpungePolicy.setValue(summary);
+	                return false;
+	            }
+	        });
+        } else {
+            ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mExpungePolicy);
+        }
+
 
         mSyncRemoteDeletions = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_REMOTE_DELETIONS);
         mSyncRemoteDeletions.setChecked(mAccount.syncRemoteDeletions());
@@ -377,18 +384,26 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
+    
+
         mMessageAge = (ListPreference) findPreference(PREFERENCE_MESSAGE_AGE);
-        mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
-        mMessageAge.setSummary(mMessageAge.getEntry());
-        mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                final String summary = newValue.toString();
-                int index = mMessageAge.findIndexOfValue(summary);
-                mMessageAge.setSummary(mMessageAge.getEntries()[index]);
-                mMessageAge.setValue(summary);
-                return false;
-            }
-        });
+
+        if (!mAccount.isSearchByDateCapable()) {
+            ((PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING)).removePreference(mMessageAge);
+       } else {
+	        mMessageAge.setValue(String.valueOf(mAccount.getMaximumPolledMessageAge()));
+	        mMessageAge.setSummary(mMessageAge.getEntry());
+	        mMessageAge.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+	            public boolean onPreferenceChange(Preference preference, Object newValue) {
+	                final String summary = newValue.toString();
+	                int index = mMessageAge.findIndexOfValue(summary);
+	                mMessageAge.setSummary(mMessageAge.getEntries()[index]);
+	                mMessageAge.setValue(summary);
+	                return false;
+	            }
+	        });
+	
+        }
 
         mMessageSize = (ListPreference) findPreference(PREFERENCE_MESSAGE_SIZE);
         mMessageSize.setValue(String.valueOf(mAccount.getMaximumAutoDownloadMessageSize()));
@@ -421,9 +436,11 @@ public class AccountSettings extends K9PreferenceActivity {
         });
 
         mAccountEnableMoveButtons = (CheckBoxPreference) findPreference(PREFERENCE_ENABLE_MOVE_BUTTONS);
+        mAccountEnableMoveButtons.setEnabled(mIsMoveCapable);
         mAccountEnableMoveButtons.setChecked(mAccount.getEnableMoveButtons());
 
         mAccountScrollMoveButtons = (ListPreference) findPreference(PREFERENCE_HIDE_MOVE_BUTTONS);
+        mAccountScrollMoveButtons.setEnabled(mIsMoveCapable);
         mAccountScrollMoveButtons.setValue("" + mAccount.getScrollMessageViewMoveButtons());
         mAccountScrollMoveButtons.setSummary(mAccountScrollMoveButtons.getEntry());
         mAccountScrollMoveButtons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ -505,10 +522,22 @@ public class AccountSettings extends K9PreferenceActivity {
                     return false;
                 }
             });
+	        mPushMode = (ListPreference) findPreference(PREFERENCE_PUSH_MODE);
+	        mPushMode.setValue(mAccount.getFolderPushMode().name());
+	        mPushMode.setSummary(mPushMode.getEntry());
+	        mPushMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+	            public boolean onPreferenceChange(Preference preference, Object newValue) {
+	                final String summary = newValue.toString();
+	                int index = mPushMode.findIndexOfValue(summary);
+	                mPushMode.setSummary(mPushMode.getEntries()[index]);
+	                mPushMode.setValue(summary);
+	                return false;
+	            }
+	        });
         } else {
-            mPushPollOnConnect.setEnabled(false);
-            mMaxPushFolders.setEnabled(false);
-            mIdleRefreshPeriod.setEnabled(false);
+            PreferenceScreen incomingPrefs = (PreferenceScreen) findPreference(PREFERENCE_SCREEN_INCOMING);
+            incomingPrefs.removePreference( (PreferenceScreen) findPreference(PREFERENCE_SCREEN_PUSH_ADVANCED));
+            incomingPrefs.removePreference( (ListPreference) findPreference(PREFERENCE_PUSH_MODE));
         }
 
         mAccountNotify = (CheckBoxPreference) findPreference(PREFERENCE_NOTIFY);
@@ -673,8 +702,10 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.setNotifySelfNewMail(mAccountNotifySelf.isChecked());
         mAccount.setShowOngoing(mAccountNotifySync.isChecked());
         mAccount.setDisplayCount(Integer.parseInt(mDisplayCount.getValue()));
-        mAccount.setMaximumPolledMessageAge(Integer.parseInt(mMessageAge.getValue()));
         mAccount.setMaximumAutoDownloadMessageSize(Integer.parseInt(mMessageSize.getValue()));
+        if (mAccount.isSearchByDateCapable()) {
+            mAccount.setMaximumPolledMessageAge(Integer.parseInt(mMessageAge.getValue()));
+        }
         mAccount.getNotificationSetting().setVibrate(mAccountVibrate.isChecked());
         mAccount.getNotificationSetting().setVibratePattern(Integer.parseInt(mAccountVibratePattern.getValue()));
         mAccount.getNotificationSetting().setVibrateTimes(Integer.parseInt(mAccountVibrateTimes.getValue()));
@@ -683,19 +714,29 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.setNotificationShowsUnreadCount(mNotificationUnreadCount.isChecked());
         mAccount.setFolderTargetMode(Account.FolderMode.valueOf(mTargetMode.getValue()));
         mAccount.setDeletePolicy(Integer.parseInt(mDeletePolicy.getValue()));
-        mAccount.setExpungePolicy(mExpungePolicy.getValue());
+        if (mIsExpungeCapable) {
+            mAccount.setExpungePolicy(mExpungePolicy.getValue());
+        };
         mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
         mAccount.setSaveAllHeaders(mSaveAllHeaders.isChecked());
         mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
         mAccount.setMessageFormat(Account.MessageFormat.valueOf(mMessageFormat.getValue()));
+        mAccount.setMessageReadReceipt(mMessageReadReceipt.isChecked());
         mAccount.setQuoteStyle(QuoteStyle.valueOf(mQuoteStyle.getValue()));
         mAccount.setQuotePrefix(mAccountQuotePrefix.getText());
+        mAccount.setDefaultQuotedTextShown(mAccountDefaultQuotedTextShown.isChecked());
         mAccount.setReplyAfterQuote(mReplyAfterQuote.isChecked());
         mAccount.setCryptoApp(mCryptoApp.getValue());
         mAccount.setCryptoAutoSignature(mCryptoAutoSignature.isChecked());
         mAccount.setLocalStorageProviderId(mLocalStorageProvider.getValue());
 
-        mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue()));
+        // In webdav account we use the exact folder name also for inbox,
+        // since it varies because of internationalization
+        if (mAccount.getStoreUri().startsWith("webdav"))
+            mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue());
+        else
+            mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue()));
+
         mAccount.setArchiveFolderName(mArchiveFolder.getValue());
         mAccount.setDraftsFolderName(mDraftsFolder.getValue());
         mAccount.setSentFolderName(mSentFolder.getValue());
@@ -709,17 +750,19 @@ public class AccountSettings extends K9PreferenceActivity {
             mAccount.setMaxPushFolders(Integer.parseInt(mMaxPushFolders.getValue()));
         }
 
+        if (!mIsMoveCapable) {
+            mAccount.setEnableMoveButtons(false);
+            mAccount.setScrollMessageViewMoveButtons(ScrollButtons.NEVER);
+        } else {
+            mAccount.setEnableMoveButtons(mAccountEnableMoveButtons.isChecked());
+            mAccount.setScrollMessageViewMoveButtons(Account.ScrollButtons.valueOf(mAccountScrollMoveButtons.getValue()));
+        }
+
         boolean needsRefresh = mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));
         needsRefresh |= mAccount.setFolderSyncMode(Account.FolderMode.valueOf(mSyncMode.getValue()));
 
-        boolean needsPushRestart = mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
         boolean displayModeChanged = mAccount.setFolderDisplayMode(Account.FolderMode.valueOf(mDisplayMode.getValue()));
 
-        if (mAccount.getFolderPushMode() != FolderMode.NONE) {
-            needsPushRestart |= displayModeChanged;
-            needsPushRestart |= mIncomingChanged;
-        }
-
         SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
         String newRingtone = prefs.getString(PREFERENCE_RINGTONE, null);
         if (newRingtone != null) {
@@ -732,18 +775,24 @@ public class AccountSettings extends K9PreferenceActivity {
         }
 
         mAccount.setScrollMessageViewButtons(Account.ScrollButtons.valueOf(mAccountScrollButtons.getValue()));
-        mAccount.setScrollMessageViewMoveButtons(Account.ScrollButtons.valueOf(mAccountScrollMoveButtons.getValue()));
         mAccount.setShowPictures(Account.ShowPictures.valueOf(mAccountShowPictures.getValue()));
-        mAccount.setEnableMoveButtons(mAccountEnableMoveButtons.isChecked());
         mAccount.save(Preferences.getPreferences(this));
-
-        if (needsRefresh && needsPushRestart) {
-            MailService.actionReset(this, null);
-        } else if (needsRefresh) {
-            MailService.actionReschedulePoll(this, null);
-        } else if (needsPushRestart) {
-            MailService.actionRestartPushers(this, null);
-        }
+       
+	    if (mIsPushCapable) {
+	        boolean needsPushRestart = mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
+	        if (mAccount.getFolderPushMode() != FolderMode.NONE) {
+	            needsPushRestart |= displayModeChanged;
+	            needsPushRestart |= mIncomingChanged;
+	        }
+	
+	        if (needsRefresh && needsPushRestart) {
+	            MailService.actionReset(this, null);
+	        } else if (needsRefresh) {
+	            MailService.actionReschedulePoll(this, null);
+	        } else if (needsPushRestart) {
+	            MailService.actionRestartPushers(this, null);
+	        }
+	    }
         // TODO: refresh folder list here
     }
 
@@ -815,7 +864,7 @@ public class AccountSettings extends K9PreferenceActivity {
     }
 
     private String translateFolder(String in) {
-        if (K9.INBOX.equalsIgnoreCase(in)) {
+        if (mAccount.getInboxFolderName().equalsIgnoreCase(in)) {
             return getString(R.string.special_mailbox_name_inbox);
         } else {
             return in;
@@ -824,7 +873,7 @@ public class AccountSettings extends K9PreferenceActivity {
 
     private String reverseTranslateFolder(String in) {
         if (getString(R.string.special_mailbox_name_inbox).equals(in)) {
-            return K9.INBOX;
+            return mAccount.getInboxFolderName();
         } else {
             return in;
         }
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
index 0bde132a1..2c31e1920 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java
@@ -18,7 +18,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import com.fsck.k9.*;
 import com.fsck.k9.activity.K9Activity;
-import com.fsck.k9.helper.Contacts;
 import com.fsck.k9.helper.Utility;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -134,17 +133,11 @@ public class AccountSetupBasics extends K9Activity
     private String getOwnerName() {
         String name = null;
         try {
-            name = Contacts.getInstance(this).getOwnerName();
+            name = getDefaultAccountName();
         } catch (Exception e) {
-            Log.e(K9.LOG_TAG, "Could not get owner name, using default account name", e);
-        }
-        if (name == null || name.length() == 0) {
-            try {
-                name = getDefaultAccountName();
-            } catch (Exception e) {
-                Log.e(K9.LOG_TAG, "Could not get default account name", e);
-            }
+            Log.e(K9.LOG_TAG, "Could not get default account name", e);
         }
+
         if (name == null) {
             name = "";
         }
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
index facae58e2..dad534767 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Process;
@@ -23,9 +24,15 @@ import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.Transport;
 import com.fsck.k9.mail.store.TrustManagerFactory;
 import com.fsck.k9.mail.store.WebDavStore;
+import com.fsck.k9.mail.filter.Hex;
 
 import java.security.cert.CertificateException;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
+import java.security.NoSuchAlgorithmException;
+import java.security.MessageDigest;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * Checks the given settings to make sure that they can be used to send and
@@ -112,7 +119,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
                             setMessage(R.string.account_setup_check_settings_fetch);
                         }
                         MessagingController.getInstance(getApplication()).listFoldersSynchronous(mAccount, true, null);
-                        MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, K9.INBOX , null, null);
+                        MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, mAccount.getInboxFolderName(), null, null);
                     }
                     if (mDestroyed) {
                         return;
@@ -236,12 +243,98 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
                 }
 
                 mProgressBar.setIndeterminate(false);
-                StringBuffer chainInfo = new StringBuffer(100);
+                StringBuilder chainInfo = new StringBuilder(100);
+                MessageDigest sha1 = null;
+                try {
+                    sha1 = MessageDigest.getInstance("SHA-1");
+                } catch (NoSuchAlgorithmException e) {
+                    Log.e(K9.LOG_TAG, "Error while initializing MessageDigest", e);
+                }
                 for (int i = 0; i < chain.length; i++) {
                     // display certificate chain information
-                    chainInfo.append("Certificate chain[" + i + "]:\n");
-                    chainInfo.append("Subject: " + chain[i].getSubjectDN().toString() + "\n");
-                    chainInfo.append("Issuer: " + chain[i].getIssuerDN().toString() + "\n");
+                    //TODO: localize this strings
+                    chainInfo.append("Certificate chain[").append(i).append("]:\n");
+                    chainInfo.append("Subject: ").append(chain[i].getSubjectDN().toString()).append("\n");
+
+                    // display SubjectAltNames too
+                    // (the user may be mislead into mistrusting a certificate
+                    //  by a subjectDN not matching the server even though a
+                    //  SubjectAltName matches)
+                    try {
+                        final Collection < List<? >> subjectAlternativeNames = chain[i].getSubjectAlternativeNames();
+                        if (subjectAlternativeNames != null) {
+                            // The list of SubjectAltNames may be very long
+                            //TODO: localize this string
+                            StringBuilder altNamesText = new StringBuilder();
+                            altNamesText.append("Subject has ").append(subjectAlternativeNames.size()).append(" alternative names\n");
+
+                            // we need these for matching
+                            String storeURIHost = (Uri.parse(mAccount.getStoreUri())).getHost();
+                            String transportURIHost = (Uri.parse(mAccount.getTransportUri())).getHost();
+
+                            for (List<?> subjectAlternativeName : subjectAlternativeNames) {
+                                Integer type = (Integer)subjectAlternativeName.get(0);
+                                Object value = subjectAlternativeName.get(1);
+                                String name = "";
+                                switch (type.intValue()) {
+                                case 0:
+                                    Log.w(K9.LOG_TAG, "SubjectAltName of type OtherName not supported.");
+                                    continue;
+                                case 1: // RFC822Name
+                                    name = (String)value;
+                                    break;
+                                case 2:  // DNSName
+                                    name = (String)value;
+                                    break;
+                                case 3:
+                                    Log.w(K9.LOG_TAG, "unsupported SubjectAltName of type x400Address");
+                                    continue;
+                                case 4:
+                                    Log.w(K9.LOG_TAG, "unsupported SubjectAltName of type directoryName");
+                                    continue;
+                                case 5:
+                                    Log.w(K9.LOG_TAG, "unsupported SubjectAltName of type ediPartyName");
+                                    continue;
+                                case 6:  // Uri
+                                    name = (String)value;
+                                    break;
+                                case 7: // ip-address
+                                    name = (String)value;
+                                    break;
+                                default:
+                                    Log.w(K9.LOG_TAG, "unsupported SubjectAltName of unknown type");
+                                    continue;
+                                }
+
+                                // if some of the SubjectAltNames match the store or transport -host,
+                                // display them
+                                if (name.equalsIgnoreCase(storeURIHost) || name.equalsIgnoreCase(transportURIHost)) {
+                                    //TODO: localize this string
+                                    altNamesText.append("Subject(alt): ").append(name).append(",...\n");
+                                } else if (name.startsWith("*.")) {
+                                    if (storeURIHost.endsWith(name.substring(2)) || transportURIHost.endsWith(name.substring(2))) {
+                                        //TODO: localize this string
+                                        altNamesText.append("Subject(alt): ").append(name).append(",...\n");
+                                    }
+                                }
+                            }
+                            chainInfo.append(altNamesText);
+                        }
+                    } catch (Exception e1) {
+                        // don't fail just because of subjectAltNames
+                        Log.w(K9.LOG_TAG, "cannot display SubjectAltNames in dialog", e1);
+                    }
+
+                    chainInfo.append("Issuer: ").append(chain[i].getIssuerDN().toString()).append("\n");
+                    if (sha1 != null) {
+                        sha1.reset();
+                        try {
+                            char[] sha1sum = Hex.encodeHex(sha1.digest(chain[i].getEncoded()));
+                            chainInfo.append("Fingerprint (SHA-1): ").append(new String(sha1sum)).append("\n");
+                        } catch (CertificateEncodingException e) {
+                            Log.e(K9.LOG_TAG, "Error while encoding certificate", e);
+                        }
+                    }
                 }
 
                 new AlertDialog.Builder(AccountSetupCheckSettings.this)
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
index 7d9f28155..1cbd7410a 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
@@ -65,10 +65,10 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
     private Button mNextButton;
     private Account mAccount;
     private boolean mMakeDefault;
-    private CheckBox compressionMobile;
-    private CheckBox compressionWifi;
-    private CheckBox compressionOther;
-    private CheckBox subscribedFoldersOnly;
+    private CheckBox mCompressionMobile;
+    private CheckBox mCompressionWifi;
+    private CheckBox mCompressionOther;
+    private CheckBox mSubscribedFoldersOnly;
 
     public static void actionIncomingSettings(Activity context, Account account, boolean makeDefault) {
         Intent i = new Intent(context, AccountSetupIncoming.class);
@@ -101,10 +101,10 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
         mWebdavAuthPathView = (EditText)findViewById(R.id.webdav_auth_path);
         mWebdavMailboxPathView = (EditText)findViewById(R.id.webdav_mailbox_path);
         mNextButton = (Button)findViewById(R.id.next);
-        compressionMobile = (CheckBox)findViewById(R.id.compression_mobile);
-        compressionWifi = (CheckBox)findViewById(R.id.compression_wifi);
-        compressionOther = (CheckBox)findViewById(R.id.compression_other);
-        subscribedFoldersOnly = (CheckBox)findViewById(R.id.subscribed_folders_only);
+        mCompressionMobile = (CheckBox)findViewById(R.id.compression_mobile);
+        mCompressionWifi = (CheckBox)findViewById(R.id.compression_wifi);
+        mCompressionOther = (CheckBox)findViewById(R.id.compression_other);
+        mSubscribedFoldersOnly = (CheckBox)findViewById(R.id.subscribed_folders_only);
 
         mNextButton.setOnClickListener(this);
 
@@ -234,10 +234,9 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 findViewById(R.id.webdav_mailbox_alias_section).setVisibility(View.GONE);
                 findViewById(R.id.webdav_owa_path_section).setVisibility(View.GONE);
                 findViewById(R.id.webdav_auth_path_section).setVisibility(View.GONE);
-                findViewById(R.id.account_auth_type_label).setVisibility(View.GONE);
-                findViewById(R.id.account_auth_type).setVisibility(View.GONE);
                 findViewById(R.id.compression_section).setVisibility(View.GONE);
                 findViewById(R.id.compression_label).setVisibility(View.GONE);
+                mSubscribedFoldersOnly.setVisibility(View.GONE);
                 mAccount.setDeletePolicy(Account.DELETE_POLICY_NEVER);
             } else if (uri.getScheme().startsWith("imap")) {
                 serverLabelView.setText(R.string.account_setup_incoming_imap_server_label);
@@ -268,7 +267,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 findViewById(R.id.account_auth_type).setVisibility(View.GONE);
                 findViewById(R.id.compression_section).setVisibility(View.GONE);
                 findViewById(R.id.compression_label).setVisibility(View.GONE);
-                subscribedFoldersOnly.setVisibility(View.GONE);
+                mSubscribedFoldersOnly.setVisibility(View.GONE);
                 if (uri.getPath() != null && uri.getPath().length() > 0) {
                     String[] pathParts = uri.getPath().split("\\|");
 
@@ -301,9 +300,9 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                     SpinnerOption.setSpinnerOptionValue(mSecurityTypeView, i);
                 }
             }
-            compressionMobile.setChecked(mAccount.useCompression(Account.TYPE_MOBILE));
-            compressionWifi.setChecked(mAccount.useCompression(Account.TYPE_WIFI));
-            compressionOther.setChecked(mAccount.useCompression(Account.TYPE_OTHER));
+            mCompressionMobile.setChecked(mAccount.useCompression(Account.TYPE_MOBILE));
+            mCompressionWifi.setChecked(mAccount.useCompression(Account.TYPE_WIFI));
+            mCompressionOther.setChecked(mAccount.useCompression(Account.TYPE_OTHER));
 
             if (uri.getHost() != null) {
                 mServerView.setText(uri.getHost());
@@ -315,7 +314,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 updatePortFromSecurityType();
             }
 
-            subscribedFoldersOnly.setChecked(mAccount.subscribedFoldersOnly());
+            mSubscribedFoldersOnly.setChecked(mAccount.subscribedFoldersOnly());
 
             validateFields();
         } catch (Exception e) {
@@ -409,7 +408,12 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
                 String authType = ((SpinnerOption)mAuthTypeView.getSelectedItem()).label;
                 userInfo = authType + ":" + userEnc + ":" + passwordEnc;
             } else {
-                userInfo = userEnc + ":" + passwordEnc;
+                String authType = ((SpinnerOption)mAuthTypeView.getSelectedItem()).label;
+                if (!authType.equalsIgnoreCase("plain")) {
+                    userInfo = authType + ":" + userEnc + ":" + passwordEnc;
+                } else {
+                    userInfo = userEnc + ":" + passwordEnc;
+                }
             }
             URI uri = new URI(
                 mAccountSchemes[securityType],
@@ -422,10 +426,10 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
             mAccount.setStoreUri(uri.toString());
 
 
-            mAccount.setCompression(Account.TYPE_MOBILE, compressionMobile.isChecked());
-            mAccount.setCompression(Account.TYPE_WIFI, compressionWifi.isChecked());
-            mAccount.setCompression(Account.TYPE_OTHER, compressionOther.isChecked());
-            mAccount.setSubscribedFoldersOnly(subscribedFoldersOnly.isChecked());
+            mAccount.setCompression(Account.TYPE_MOBILE, mCompressionMobile.isChecked());
+            mAccount.setCompression(Account.TYPE_WIFI, mCompressionWifi.isChecked());
+            mAccount.setCompression(Account.TYPE_OTHER, mCompressionOther.isChecked());
+            mAccount.setSubscribedFoldersOnly(mSubscribedFoldersOnly.isChecked());
 
             AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, false);
         } catch (Exception e) {
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
index a89678a8c..73738fe3f 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
@@ -16,6 +16,8 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import com.fsck.k9.*;
 import com.fsck.k9.activity.K9Activity;
 import com.fsck.k9.helper.Utility;
+import com.fsck.k9.mail.transport.SmtpTransport;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -29,7 +31,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
     private static final String EXTRA_MAKE_DEFAULT = "makeDefault";
 
     private static final int smtpPorts[] = {
-        25, 465, 465, 25, 25
+        587, 465, 465, 587, 587
     };
 
     private static final String smtpSchemes[] = {
@@ -45,10 +47,13 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
         "webdav", "webdav+ssl", "webdav+ssl+", "webdav+tls", "webdav+tls+"
     };
     */
-
     private static final String authTypes[] = {
-        "PLAIN", "CRAM_MD5"
+        SmtpTransport.AUTH_AUTOMATIC,
+        SmtpTransport.AUTH_LOGIN,
+        SmtpTransport.AUTH_PLAIN,
+        SmtpTransport.AUTH_CRAM_MD5,
     };
+
     private EditText mUsernameView;
     private EditText mPasswordView;
     private EditText mServerView;
@@ -117,14 +122,10 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
             new SpinnerOption(4, getString(R.string.account_setup_incoming_security_tls_label)),
         };
 
-        // This needs to be kept in sync with the list at the top of the file.
-        // that makes me somewhat unhappy
-        SpinnerOption authTypeSpinnerOptions[] = {
-            new SpinnerOption(0, "PLAIN"),
-            new SpinnerOption(1, "CRAM_MD5")
-        };
-
-
+        SpinnerOption authTypeSpinnerOptions[] = new SpinnerOption[authTypes.length];
+        for (int i = 0; i < authTypes.length; i++) {
+            authTypeSpinnerOptions[i] = new SpinnerOption(i, authTypes[i]);
+        }
 
         ArrayAdapter<SpinnerOption> securityTypesAdapter = new ArrayAdapter<SpinnerOption>(this,
                 android.R.layout.simple_spinner_item, securityTypes);
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index fdd190b54..c9f5c15a3 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -1,5 +1,6 @@
 package com.fsck.k9.activity.setup;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Vector;
@@ -8,11 +9,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
@@ -23,6 +26,8 @@ import com.fsck.k9.activity.Accounts;
 import com.fsck.k9.activity.ColorPickerDialog;
 import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.helper.DateFormatter;
+import com.fsck.k9.helper.FileBrowserHelper;
+import com.fsck.k9.helper.FileBrowserHelper.FileBrowserFailOverCallback;
 import com.fsck.k9.preferences.CheckBoxListPreference;
 import com.fsck.k9.preferences.TimePickerPreference;
 
@@ -52,6 +57,7 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_PRIVACY_MODE = "privacy_mode";
     private static final String PREFERENCE_MEASURE_ACCOUNTS = "measure_accounts";
     private static final String PREFERENCE_COUNT_SEARCH = "count_search";
+    private static final String PREFERENCE_HIDE_SPECIAL_ACCOUNTS = "hide_special_accounts";
     private static final String PREFERENCE_MESSAGELIST_TOUCHABLE = "messagelist_touchable";
     private static final String PREFERENCE_MESSAGELIST_PREVIEW_LINES = "messagelist_preview_lines";
     private static final String PREFERENCE_MESSAGELIST_STARS = "messagelist_stars";
@@ -63,6 +69,7 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_COMPACT_LAYOUTS = "compact_layouts";
 
     private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
+    private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next";
     private static final String PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED = "messageview_zoom_controls";
     private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled";
     private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts";
@@ -75,7 +82,9 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_DEBUG_LOGGING = "debug_logging";
     private static final String PREFERENCE_SENSITIVE_LOGGING = "sensitive_logging";
 
+    private static final String PREFERENCE_ATTACHMENT_DEF_PATH = "attachment_default_path";
 
+    private static final int ACTIVITY_CHOOSE_FOLDER = 1;
     private ListPreference mLanguage;
     private ListPreference mTheme;
     private ListPreference mDateFormat;
@@ -88,6 +97,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mPrivacyMode;
     private CheckBoxPreference mMeasureAccounts;
     private CheckBoxPreference mCountSearch;
+    private CheckBoxPreference mHideSpecialAccounts;
     private CheckBoxPreference mTouchable;
     private ListPreference mPreviewLines;
     private CheckBoxPreference mStars;
@@ -97,6 +107,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mChangeContactNameColor;
     private CheckBoxPreference mFixedWidth;
     private CheckBoxPreference mReturnToList;
+    private CheckBoxPreference mShowNext;
     private CheckBoxPreference mZoomControlsEnabled;
     private CheckBoxPreference mMobileOptimizedLayout;
     private ListPreference mBackgroundOps;
@@ -108,7 +119,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mQuietTimeEnabled;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeEnds;
-
+    private Preference mAttachmentPathPreference;
 
 
     public static void actionPrefs(Context context) {
@@ -179,8 +190,16 @@ public class Prefs extends K9PreferenceActivity {
         mStartIntegratedInbox.setChecked(K9.startIntegratedInbox());
 
         mConfirmActions = (CheckBoxListPreference) findPreference(PREFERENCE_CONFIRM_ACTIONS);
-        mConfirmActions.setItems(new CharSequence[] {getString(R.string.global_settings_confirm_action_delete)});
-        mConfirmActions.setCheckedItems(new boolean[] {K9.confirmDelete()});
+        mConfirmActions.setItems(new CharSequence[] {
+                                     getString(R.string.global_settings_confirm_action_delete),
+                                     getString(R.string.global_settings_confirm_action_spam),
+                                     getString(R.string.global_settings_confirm_action_mark_all_as_read)
+                                 });
+        mConfirmActions.setCheckedItems(new boolean[] {
+                                            K9.confirmDelete(),
+                                            K9.confirmSpam(),
+                                            K9.confirmMarkAllAsRead()
+                                        });
 
         mPrivacyMode = (CheckBoxPreference) findPreference(PREFERENCE_PRIVACY_MODE);
         mPrivacyMode.setChecked(K9.keyguardPrivacy());
@@ -191,6 +210,9 @@ public class Prefs extends K9PreferenceActivity {
         mCountSearch = (CheckBoxPreference)findPreference(PREFERENCE_COUNT_SEARCH);
         mCountSearch.setChecked(K9.countSearchMessages());
 
+        mHideSpecialAccounts = (CheckBoxPreference)findPreference(PREFERENCE_HIDE_SPECIAL_ACCOUNTS);
+        mHideSpecialAccounts.setChecked(K9.isHideSpecialAccounts());
+
         mTouchable = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_TOUCHABLE);
         mTouchable.setChecked(K9.messageListTouchable());
 
@@ -236,6 +258,9 @@ public class Prefs extends K9PreferenceActivity {
         mReturnToList = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST);
         mReturnToList.setChecked(K9.messageViewReturnToList());
 
+        mShowNext = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_SHOW_NEXT);
+        mShowNext.setChecked(K9.messageViewShowNext());
+
         mZoomControlsEnabled = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED);
         mZoomControlsEnabled.setChecked(K9.zoomControlsEnabled());
 
@@ -285,6 +310,36 @@ public class Prefs extends K9PreferenceActivity {
 
         mDebugLogging.setChecked(K9.DEBUG);
         mSensitiveLogging.setChecked(K9.DEBUG_SENSITIVE);
+
+        mAttachmentPathPreference = findPreference(PREFERENCE_ATTACHMENT_DEF_PATH);
+        mAttachmentPathPreference.setSummary(K9.getAttachmentDefaultPath());
+        mAttachmentPathPreference
+        .setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                FileBrowserHelper
+                .getInstance()
+                .showFileBrowserActivity(Prefs.this,
+                                         new File(K9.getAttachmentDefaultPath()),
+                                         ACTIVITY_CHOOSE_FOLDER, callback);
+
+                return true;
+            }
+
+            FileBrowserFailOverCallback callback = new FileBrowserFailOverCallback() {
+
+                @Override
+                public void onPathEntered(String path) {
+                    mAttachmentPathPreference.setSummary(path);
+                    K9.setAttachmentDefaultPath(path);
+                }
+
+                @Override
+                public void onCancel() {
+                    // canceled, do nothing
+                }
+            };
+        });
     }
 
     private void saveSettings() {
@@ -298,11 +353,14 @@ public class Prefs extends K9PreferenceActivity {
         K9.setUseVolumeKeysForNavigation(mVolumeNavigation.getCheckedItems()[0]);
         K9.setUseVolumeKeysForListNavigation(mVolumeNavigation.getCheckedItems()[1]);
         K9.setManageBack(mManageBack.isChecked());
-        K9.setStartIntegratedInbox(mStartIntegratedInbox.isChecked());
+        K9.setStartIntegratedInbox(!mHideSpecialAccounts.isChecked() && mStartIntegratedInbox.isChecked());
         K9.setConfirmDelete(mConfirmActions.getCheckedItems()[0]);
+        K9.setConfirmSpam(mConfirmActions.getCheckedItems()[1]);
+        K9.setConfirmMarkAllAsRead(mConfirmActions.getCheckedItems()[2]);
         K9.setKeyguardPrivacy(mPrivacyMode.isChecked());
         K9.setMeasureAccounts(mMeasureAccounts.isChecked());
         K9.setCountSearchMessages(mCountSearch.isChecked());
+        K9.setHideSpecialAccounts(mHideSpecialAccounts.isChecked());
         K9.setMessageListTouchable(mTouchable.isChecked());
         K9.setMessageListPreviewLines(Integer.parseInt(mPreviewLines.getValue()));
         K9.setMessageListStars(mStars.isChecked());
@@ -312,6 +370,7 @@ public class Prefs extends K9PreferenceActivity {
         K9.setChangeContactNameColor(mChangeContactNameColor.isChecked());
         K9.setMessageViewFixedWidthFont(mFixedWidth.isChecked());
         K9.setMessageViewReturnToList(mReturnToList.isChecked());
+        K9.setMessageViewShowNext(mShowNext.isChecked());
         K9.setMobileOptimizedLayout(mMobileOptimizedLayout.isChecked());
         K9.setQuietTimeEnabled(mQuietTimeEnabled.isChecked());
 
@@ -320,7 +379,7 @@ public class Prefs extends K9PreferenceActivity {
 
 
         K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked());
-
+        K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());
         boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue());
         K9.setUseGalleryBugWorkaround(mUseGalleryBugWorkaround.isChecked());
 
@@ -365,4 +424,25 @@ public class Prefs extends K9PreferenceActivity {
         },
         K9.getContactNameColor()).show();
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+        case ACTIVITY_CHOOSE_FOLDER:
+            if (resultCode == RESULT_OK && data != null) {
+                // obtain the filename
+                Uri fileUri = data.getData();
+                if (fileUri != null) {
+                    String filePath = fileUri.getPath();
+                    if (filePath != null) {
+                        mAttachmentPathPreference.setSummary(filePath.toString());
+                        K9.setAttachmentDefaultPath(filePath.toString());
+                    }
+                }
+            }
+            break;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 3058874fc..8b188c298 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -719,7 +719,7 @@ public class MessagingController implements Runnable {
                                 }
                             }
                             // Never exclude the INBOX (see issue 1817)
-                            else if (noSpecialFolders && !localFolderName.equalsIgnoreCase(K9.INBOX) &&
+                            else if (noSpecialFolders && !localFolderName.equalsIgnoreCase(account.getInboxFolderName()) &&
                                      !localFolderName.equals(account.getArchiveFolderName()) && account.isSpecialFolder(localFolderName)) {
                                 include = false;
                             } else if (displayableOnly && modeMismatch(account.getFolderDisplayMode(), folder.getDisplayClass())) {
@@ -793,7 +793,7 @@ public class MessagingController implements Runnable {
             LocalStore localStore = account.getLocalStore();
             LocalFolder localFolder = localStore.getFolder(folder);
             if (localFolder.getVisibleLimit() > 0) {
-                localFolder.setVisibleLimit(localFolder.getVisibleLimit() + account.getDisplayCount());
+                localFolder.setVisibleLimit(localFolder.getVisibleLimit() + localFolder.getMessageCount());
             }
             synchronizeMailbox(account, folder, listener, null);
         } catch (MessagingException me) {
@@ -1161,12 +1161,32 @@ public class MessagingController implements Runnable {
         }
     }
 
+    /**
+     * Fetches the messages described by inputMessages from the remote store and writes them to
+     * local storage.
+     *
+     * @param account
+     *            The account the remote store belongs to.
+     * @param remoteFolder
+     *            The remote folder to download messages from.
+     * @param localFolder
+     *            The {@link LocalFolder} instance corresponding to the remote folder.
+     * @param inputMessages
+     *            A list of messages objects that store the UIDs of which messages to download.
+     * @param flagSyncOnly
+     *            Only flags will be fetched from the remote store if this is {@code true}.
+     *
+     * @return The number of downloaded messages that are not flagged as {@link Flag#SEEN}.
+     *
+     * @throws MessagingException
+     */
     private int downloadMessages(final Account account, final Folder remoteFolder,
-                                 final LocalFolder localFolder, List<Message> inputMessages, boolean flagSyncOnly) throws MessagingException {
+                                 final LocalFolder localFolder, List<Message> inputMessages,
+                                 boolean flagSyncOnly) throws MessagingException {
+
         final Date earliestDate = account.getEarliestPollDate();
         Date downloadStarted = new Date(); // now
 
-
         if (earliestDate != null) {
             if (K9.DEBUG) {
                 Log.d(K9.LOG_TAG, "Only syncing messages after " + earliestDate);
@@ -1421,7 +1441,8 @@ public class MessagingController implements Runnable {
                         return;
                     }
 
-                    if (message.getSize() > account.getMaximumAutoDownloadMessageSize()) {
+                    if (account.getMaximumAutoDownloadMessageSize() > 0 &&
+                    message.getSize() > account.getMaximumAutoDownloadMessageSize()) {
                         largeMessages.add(message);
                     } else {
                         smallMessages.add(message);
@@ -1513,7 +1534,7 @@ public class MessagingController implements Runnable {
             return false;
 
         }
-        if (message.olderThan(earliestDate)) {
+        if (account.isSearchByDateCapable() && message.olderThan(earliestDate)) {
             if (K9.DEBUG) {
                 Log.d(K9.LOG_TAG, "Message " + message.getUid() + " is older than "
                       + earliestDate + ", hence not saving");
@@ -1541,7 +1562,7 @@ public class MessagingController implements Runnable {
         remoteFolder.fetch(smallMessages.toArray(new Message[smallMessages.size()]),
         fp, new MessageRetrievalListener() {
             @Override
-            public void messageFinished(Message message, int number, int ofTotal) {
+            public void messageFinished(final Message message, int number, int ofTotal) {
                 try {
 
                     if (!shouldImportMessage(account, folder, message, progress, earliestDate)) {
@@ -1557,6 +1578,13 @@ public class MessagingController implements Runnable {
                             progress.incrementAndGet();
                         }
                     });
+
+                    // Increment the number of "new messages" if the newly downloaded message is
+                    // not marked as read.
+                    if (!localMessage.isSet(Flag.SEEN)) {
+                        newMessages.incrementAndGet();
+                    }
+
                     if (K9.DEBUG)
                         Log.v(K9.LOG_TAG, "About to notify listeners that we got a new small message "
                               + account + ":" + folder + ":" + message.getUid());
@@ -1572,7 +1600,6 @@ public class MessagingController implements Runnable {
                     // Send a notification of this message
 
                     if (shouldNotifyForMessage(account, localFolder, message)) {
-                        newMessages.incrementAndGet();
                         notifyAccount(mApplication, account, message, unreadBeforeStart, newMessages);
                     }
 
@@ -1648,8 +1675,11 @@ public class MessagingController implements Runnable {
                      * the account's autodownload size limit, otherwise mark as only a partial
                      * download.  This will prevent the system from downloading the same message
                      * twice.
+                     *
+                     * If there is no limit on autodownload size, that's the same as the message
+                     * being smaller than the max size
                      */
-                    if (message.getSize() < account.getMaximumAutoDownloadMessageSize()) {
+                    if (account.getMaximumAutoDownloadMessageSize() == 0 || message.getSize() < account.getMaximumAutoDownloadMessageSize()) {
                         localMessage.setFlag(Flag.X_DOWNLOADED_FULL, true);
                     } else {
                         // Set a flag indicating that the message has been partially downloaded and
@@ -1691,6 +1721,13 @@ public class MessagingController implements Runnable {
             // Update the listener with what we've found
             progress.incrementAndGet();
             Message localMessage = localFolder.getMessage(message.getUid());
+
+            // Increment the number of "new messages" if the newly downloaded message is
+            // not marked as read.
+            if (!localMessage.isSet(Flag.SEEN)) {
+                newMessages.incrementAndGet();
+            }
+
             for (MessagingListener l : getListeners()) {
                 l.synchronizeMailboxAddOrUpdateMessage(account, folder, localMessage);
                 l.synchronizeMailboxProgress(account, folder, progress.get(), todo);
@@ -1701,11 +1738,10 @@ public class MessagingController implements Runnable {
 
             // Send a notification of this message
             if (shouldNotifyForMessage(account, localFolder, message)) {
-                newMessages.incrementAndGet();
                 notifyAccount(mApplication, account, message, unreadBeforeStart, newMessages);
             }
 
-        }//for large messsages
+        }//for large messages
         if (K9.DEBUG)
             Log.d(K9.LOG_TAG, "SYNC: Done fetching large messages for folder " + folder);
 
@@ -1787,7 +1823,11 @@ public class MessagingController implements Runnable {
                 rootCause = nextCause;
             }
         } while (nextCause != null);
-        return rootCause.getMessage();
+        if (rootCause instanceof MessagingException) {
+            return rootCause.getMessage();
+        } else {
+            return rootCause.toString();
+        }
     }
 
     private void queuePendingCommand(Account account, PendingCommand command) {
@@ -2170,14 +2210,7 @@ public class MessagingController implements Runnable {
 
         Store remoteStore = account.getRemoteStore();
         Folder remoteFolder = remoteStore.getFolder(folder);
-        if (!remoteFolder.exists() ||
-                /*
-                 * Don't proceed if the remote folder doesn't support flags and
-                 * the flag to be changed isn't the deleted flag. This avoids
-                 * unnecessary connections to POP3 servers.
-                 */
-                // TODO: This should actually call a supportsSettingFlag(flag) method.
-                (!remoteFolder.supportsFetchingFlags() && !Flag.DELETED.equals(flag))) {
+        if (!remoteFolder.exists() || !remoteFolder.isFlagSupported(flag)) {
             return;
         }
 
@@ -2381,7 +2414,7 @@ public class MessagingController implements Runnable {
             Store remoteStore = account.getRemoteStore();
             remoteFolder = remoteStore.getFolder(folder);
 
-            if (!remoteFolder.exists()) {
+            if (!remoteFolder.exists() || !remoteFolder.isFlagSupported(Flag.SEEN)) {
                 return;
             }
             remoteFolder.open(OpenMode.READ_WRITE);
@@ -2709,31 +2742,21 @@ public class MessagingController implements Runnable {
          */
 
         if (part.getBody() != null) {
-            for (MessagingListener l : getListeners()) {
+            for (MessagingListener l : getListeners(listener)) {
                 l.loadAttachmentStarted(account, message, part, tag, false);
             }
-            if (listener != null) {
-                listener.loadAttachmentStarted(account, message, part, tag, false);
-            }
 
-            for (MessagingListener l : getListeners()) {
+            for (MessagingListener l : getListeners(listener)) {
                 l.loadAttachmentFinished(account, message, part, tag);
             }
-
-            if (listener != null) {
-                listener.loadAttachmentFinished(account, message, part, tag);
-            }
             return;
         }
 
 
 
-        for (MessagingListener l : getListeners()) {
+        for (MessagingListener l : getListeners(listener)) {
             l.loadAttachmentStarted(account, message, part, tag, true);
         }
-        if (listener != null) {
-            listener.loadAttachmentStarted(account, message, part, tag, false);
-        }
 
         put("loadAttachment", listener, new Runnable() {
             @Override
@@ -2760,22 +2783,16 @@ public class MessagingController implements Runnable {
                     remoteFolder.fetchPart(remoteMessage, part, null);
 
                     localFolder.updateMessage((LocalMessage)message);
-                    for (MessagingListener l : getListeners()) {
+                    for (MessagingListener l : getListeners(listener)) {
                         l.loadAttachmentFinished(account, message, part, tag);
                     }
-                    if (listener != null) {
-                        listener.loadAttachmentFinished(account, message, part, tag);
-                    }
                 } catch (MessagingException me) {
                     if (K9.DEBUG)
                         Log.v(K9.LOG_TAG, "Exception loading attachment", me);
 
-                    for (MessagingListener l : getListeners()) {
+                    for (MessagingListener l : getListeners(listener)) {
                         l.loadAttachmentFailed(account, message, part, tag, me.getMessage());
                     }
-                    if (listener != null) {
-                        listener.loadAttachmentFailed(account, message, part, tag, me.getMessage());
-                    }
                     addErrorMessage(account, null, me);
 
                 } finally {
@@ -2876,7 +2893,7 @@ public class MessagingController implements Runnable {
             (NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
         Notification notif = new Notification(R.drawable.ic_menu_refresh,
                                               mApplication.getString(R.string.notification_bg_send_ticker, account.getDescription()), System.currentTimeMillis());
-        Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, K9.INBOX);
+        Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, account.getInboxFolderName());
         PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0);
         notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.notification_bg_send_title),
                                  account.getDescription() , pi);
@@ -2889,15 +2906,21 @@ public class MessagingController implements Runnable {
         notifMgr.notify(K9.FETCHING_EMAIL_NOTIFICATION - account.getAccountNumber(), notif);
     }
 
-    private void notifySendFailed(Account account, Exception lastFailure) {
+    private void notifySendTempFailed(Account account, Exception lastFailure) {
+        notifySendFailed(account, lastFailure, account.getOutboxFolderName());
+    }
+    private void notifySendPermFailed(Account account, Exception lastFailure) {
+        notifySendFailed(account, lastFailure, account.getDraftsFolderName());
+    }
+    private void notifySendFailed(Account account, Exception lastFailure, String openFolder) {
         NotificationManager notifMgr = (NotificationManager)mApplication.getSystemService(Context.NOTIFICATION_SERVICE);
         Notification notif = new Notification(R.drawable.stat_notify_email_generic, mApplication.getString(R.string.send_failure_subject), System.currentTimeMillis());
 
-        Intent i = FolderList.actionHandleNotification(mApplication, account, account.getOutboxFolderName());
+        Intent i = FolderList.actionHandleNotification(mApplication, account, openFolder);
 
         PendingIntent pi = PendingIntent.getActivity(mApplication, 0, i, 0);
 
-        notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.send_failure_subject), lastFailure.getMessage(), pi);
+        notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.send_failure_subject), getRootCauseMessage(lastFailure), pi);
 
         configureNotification(notif,  null, null, K9.NOTIFICATION_LED_SENDING_FAILURE_COLOR, K9.NOTIFICATION_LED_BLINK_FAST, true);
         notif.flags |= Notification.FLAG_AUTO_CANCEL;
@@ -2912,7 +2935,7 @@ public class MessagingController implements Runnable {
             Notification notif = new Notification(R.drawable.ic_menu_refresh,
                                                   mApplication.getString(R.string.notification_bg_sync_ticker, account.getDescription(), folder.getName()),
                                                   System.currentTimeMillis());
-            Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, K9.INBOX);
+            Intent intent = MessageList.actionHandleFolderIntent(mApplication, account, account.getInboxFolderName());
             PendingIntent pi = PendingIntent.getActivity(mApplication, 0, intent, 0);
             notif.setLatestEventInfo(mApplication, mApplication.getString(R.string.notification_bg_sync_title), account.getDescription()
                                      + mApplication.getString(R.string.notification_bg_title_separator) + folder.getName(), pi);
@@ -3005,8 +3028,26 @@ public class MessagingController implements Runnable {
                     if (K9.DEBUG)
                         Log.i(K9.LOG_TAG, "Send count for message " + message.getUid() + " is " + count.get());
 
+                    if (count.incrementAndGet() > K9.MAX_SEND_ATTEMPTS) {
+                        Log.e(K9.LOG_TAG, "Send count for message " + message.getUid() + " can't be delivered after " + K9.MAX_SEND_ATTEMPTS + " attempts.  Giving up until the user restarts the device");
+                        notifySendTempFailed(account, new MessagingException(message.getSubject()));
+                        continue;
+                    }
+
+
+
                     localFolder.fetch(new Message[] { message }, fp, null);
                     try {
+
+
+                        if (message.getHeader(K9.IDENTITY_HEADER) != null) {
+                            Log.v(K9.LOG_TAG, "The user has set the Outbox and Drafts folder to the same thing. " +
+                                  "This message appears to be a draft, so K-9 will not send it");
+                            continue;
+
+                        }
+
+
                         message.setFlag(Flag.X_SEND_IN_PROGRESS, true);
                         if (K9.DEBUG)
                             Log.i(K9.LOG_TAG, "Sending message with UID " + message.getUid());
@@ -3039,6 +3080,15 @@ public class MessagingController implements Runnable {
                         }
 
                     } catch (Exception e) {
+                        // 5.x.x errors from the SMTP server are "PERMFAIL"
+                        // move the message over to drafts rather than leaving it in the outbox
+                        // This is a complete hack, but is worlds better than the previous
+                        // "don't even bother" functionality
+                        if (getRootCauseMessage(e).startsWith("5")) {
+                            localFolder.moveMessages(new Message[] { message }, (LocalFolder) localStore.getFolder(account.getDraftsFolderName()));
+                        } else {
+                        }
+
                         message.setFlag(Flag.X_SEND_FAILED, true);
                         Log.e(K9.LOG_TAG, "Failed to send message", e);
                         for (MessagingListener l : getListeners()) {
@@ -3058,7 +3108,11 @@ public class MessagingController implements Runnable {
                 l.sendPendingMessagesCompleted(account);
             }
             if (lastFailure != null) {
-                notifySendFailed(account, lastFailure);
+                if (getRootCauseMessage(lastFailure).startsWith("5")) {
+                    notifySendPermFailed(account, lastFailure);
+                } else {
+                    notifySendTempFailed(account, lastFailure);
+                }
             }
         } catch (UnavailableStorageException e) {
             Log.i(K9.LOG_TAG, "Failed to send pending messages because storage is not available - trying again later.");
@@ -3301,10 +3355,7 @@ public class MessagingController implements Runnable {
             //We need to make these callbacks before moving the messages to the trash
             //as messages get a new UID after being moved
             for (Message message : messages) {
-                if (listener != null) {
-                    listener.messageDeleted(account, folder, message);
-                }
-                for (MessagingListener l : getListeners()) {
+                for (MessagingListener l : getListeners(listener)) {
                     l.messageDeleted(account, folder, message);
                 }
             }
@@ -3743,10 +3794,7 @@ public class MessagingController implements Runnable {
                     long oldSize = localStore.getSize();
                     localStore.compact();
                     long newSize = localStore.getSize();
-                    if (ml != null) {
-                        ml.accountSizeChanged(account, oldSize, newSize);
-                    }
-                    for (MessagingListener l : getListeners()) {
+                    for (MessagingListener l : getListeners(ml)) {
                         l.accountSizeChanged(account, oldSize, newSize);
                     }
                 } catch (UnavailableStorageException e) {
@@ -3773,11 +3821,7 @@ public class MessagingController implements Runnable {
                     stats.size = newSize;
                     stats.unreadMessageCount = 0;
                     stats.flaggedMessageCount = 0;
-                    if (ml != null) {
-                        ml.accountSizeChanged(account, oldSize, newSize);
-                        ml.accountStatusChanged(account, stats);
-                    }
-                    for (MessagingListener l : getListeners()) {
+                    for (MessagingListener l : getListeners(ml)) {
                         l.accountSizeChanged(account, oldSize, newSize);
                         l.accountStatusChanged(account, stats);
                     }
@@ -3805,11 +3849,7 @@ public class MessagingController implements Runnable {
                     stats.size = newSize;
                     stats.unreadMessageCount = 0;
                     stats.flaggedMessageCount = 0;
-                    if (ml != null) {
-                        ml.accountSizeChanged(account, oldSize, newSize);
-                        ml.accountStatusChanged(account, stats);
-                    }
-                    for (MessagingListener l : getListeners()) {
+                    for (MessagingListener l : getListeners(ml)) {
                         l.accountSizeChanged(account, oldSize, newSize);
                         l.accountStatusChanged(account, stats);
                     }
@@ -3825,18 +3865,31 @@ public class MessagingController implements Runnable {
 
 
     private boolean shouldNotifyForMessage(Account account, LocalFolder localFolder, Message message) {
-        // Do not notify if the user does not have notifications
-        // enabled or if the message has been read
-        if (!account.isNotifyNewMail() || message.isSet(Flag.SEEN) || (account.getName() == null)) {
+        // If we don't even have an account name, don't show the notification.
+        // (This happens during initial account setup)
+        if (account.getName() == null) {
             return false;
         }
 
+        // Do not notify if the user does not have notifications enabled or if the message has
+        // been read.
+        if (!account.isNotifyNewMail() || message.isSet(Flag.SEEN)) {
+            return false;
+        }
+
+        // If the account is a POP3 account and the message is older than the oldest message we've
+        // previously seen, then don't notify about it.
+        if (account.getStoreUri().startsWith("pop3") &&
+                message.olderThan(new Date(account.getLatestOldMessageSeenTime()))) {
+            return false;
+        }
+
+        // No notification for new messages in Trash, Drafts, Spam or Sent folder.
+        // But do notify if it's the INBOX (see issue 1817).
         Folder folder = message.getFolder();
         if (folder != null) {
-            // No notification for new messages in Trash, Drafts, Spam or Sent folder.
-            // But do notify if it's the INBOX (see issue 1817).
             String folderName = folder.getName();
-            if (!K9.INBOX.equals(folderName) &&
+            if (!account.getInboxFolderName().equals(folderName) &&
                     (account.getTrashFolderName().equals(folderName)
                      || account.getDraftsFolderName().equals(folderName)
                      || account.getSpamFolderName().equals(folderName)
@@ -3850,7 +3903,8 @@ public class MessagingController implements Runnable {
                 Integer messageUid = Integer.parseInt(message.getUid());
                 if (messageUid <= localFolder.getLastUid()) {
                     if (K9.DEBUG)
-                        Log.d(K9.LOG_TAG, "Message uid is " + messageUid + ", max message uid is " + localFolder.getLastUid() + ".  Skipping notification.");
+                        Log.d(K9.LOG_TAG, "Message uid is " + messageUid + ", max message uid is " +
+                              localFolder.getLastUid() + ".  Skipping notification.");
                     return false;
                 }
             } catch (NumberFormatException e) {
@@ -3858,31 +3912,22 @@ public class MessagingController implements Runnable {
             }
         }
 
-        return true;
+        // Don't notify if the sender address matches one of our identities and the user chose not
+        // to be notified for such messages.
+        if (account.isAnIdentity(message.getFrom()) && !account.isNotifySelfNewMail()) {
+            return false;
+        }
 
+        return true;
     }
 
 
 
-    /** Creates a notification of new email messages
-      * ringtone, lights, and vibration to be played
-    */
-    private boolean notifyAccount(Context context, Account account, Message message, int previousUnreadMessageCount, AtomicInteger newMessageCount) {
-        // If we don't even have an account name, don't show the notification
-        // (This happens during initial account setup)
-        //
-        if (account.getName() == null) {
-            return false;
-        }
-
-        // If the account us a POP3 account and the message is older than
-        // the oldest message we've previously seen then don't notify about it
-        if (account.getStoreUri().startsWith("pop3")) {
-            if (message.olderThan(new Date(account.getLatestOldMessageSeenTime()))) {
-                return false;
-            }
-        }
-
+    /**
+     * Creates a notification of a newly received message.
+     */
+    private void notifyAccount(Context context, Account account, Message message,
+                               int previousUnreadMessageCount, AtomicInteger newMessageCount) {
 
         // If we have a message, set the notification to "<From>: <Subject>"
         StringBuilder messageNotice = new StringBuilder();
@@ -3903,19 +3948,13 @@ public class MessagingController implements Runnable {
                     }
                     // show To: if the message was sent from me
                     else {
-                        if (!account.isNotifySelfNewMail()) {
-                            return false;
-                        }
-
                         Address[] rcpts = message.getRecipients(Message.RecipientType.TO);
                         String to = rcpts.length > 0 ? rcpts[0].toFriendly().toString() : null;
                         if (to != null) {
                             messageNotice.append(String.format(context.getString(R.string.message_to_fmt), to)).append(": ").append(subject);
                         } else {
                             messageNotice.append(context.getString(R.string.general_no_sender)).append(": ").append(subject);
-
                         }
-
                     }
                 }
             }
@@ -3941,7 +3980,8 @@ public class MessagingController implements Runnable {
         Intent i = FolderList.actionHandleNotification(context, account, message.getFolder().getName());
         PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
 
-        String accountNotice = context.getString(R.string.notification_new_one_account_fmt, unreadCount, account.getDescription());
+        String accountDescr = (account.getDescription() != null) ? account.getDescription() : account.getEmail();
+        String accountNotice = context.getString(R.string.notification_new_one_account_fmt, unreadCount, accountDescr);
         notif.setLatestEventInfo(context, accountNotice, messageNotice, pi);
 
         // Only ring or vibrate if we have not done so already on this
@@ -3957,7 +3997,6 @@ public class MessagingController implements Runnable {
         configureNotification(notif, (n.shouldRing() ?  n.getRingtone() : null), (n.shouldVibrate() ? n.getVibration() : null), (n.isLed() ?  n.getLedColor()  : null), K9.NOTIFICATION_LED_BLINK_SLOW, ringAndVibrate);
 
         notifMgr.notify(account.getAccountNumber(), notif);
-        return true;
     }
 
     /**
diff --git a/src/com/fsck/k9/helper/AutoSyncHelper.java b/src/com/fsck/k9/helper/AutoSyncHelper.java
index 84b728d5d..23e6b5907 100644
--- a/src/com/fsck/k9/helper/AutoSyncHelper.java
+++ b/src/com/fsck/k9/helper/AutoSyncHelper.java
@@ -12,7 +12,7 @@ public class AutoSyncHelper {
      * False, if we never tried to load the class for this SDK version.
      * True, otherwise.
      *
-     * Note: if sAutoSync is null and sChecked is true, then an error occured
+     * Note: if sAutoSync is null and sChecked is true, then an error occurred
      * while loading the class for the SDK version we're running on.
      */
     private static boolean sChecked = false;
diff --git a/src/com/fsck/k9/helper/Contacts.java b/src/com/fsck/k9/helper/Contacts.java
index f413639cd..acf97d174 100644
--- a/src/com/fsck/k9/helper/Contacts.java
+++ b/src/com/fsck/k9/helper/Contacts.java
@@ -6,6 +6,7 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Build;
+import android.content.Intent;
 import android.util.Log;
 import com.fsck.k9.K9;
 import com.fsck.k9.mail.Address;
@@ -84,6 +85,7 @@ public abstract class Contacts {
 
     protected Context mContext;
     protected ContentResolver mContentResolver;
+    protected Boolean mHasContactPicker;
 
     /**
      * Constructor
@@ -95,13 +97,6 @@ public abstract class Contacts {
         mContentResolver = context.getContentResolver();
     }
 
-    /**
-     * Get the name of the device's owner.
-     *
-     * @return The name of the owner if available. <tt>null</tt>, otherwise.
-     */
-    public abstract String getOwnerName();
-
     /**
      * Start the activity to add information to an existing contact or add a
      * new one.
@@ -166,4 +161,35 @@ public abstract class Contacts {
      *        contacts to be marked as contacted.
      */
     public abstract void markAsContacted(final Address[] addresses);
+
+    /**
+     * Creates the intent necessary to open a contact picker.
+     *
+     * @return The intent necessary to open a contact picker.
+     */
+    public abstract Intent contactPickerIntent();
+
+    /**
+     * Given a contact picker intent, returns the primary email address of that
+     * contact.
+     *
+     * @param intent The {@link Intent} returned by this contact picker.
+     * @return The primary email address of the picked contact.
+     */
+    public abstract String getEmailFromContactPicker(final Intent intent);
+
+    /**
+     * Does the device actually have a Contacts application suitable for
+     * picking a contact. As hard as it is to believe, some vendors ship
+     * without it.
+     *
+     * @return True, if the device supports picking contacts. False, otherwise.
+     */
+    public boolean hasContactPicker() {
+        if (mHasContactPicker == null) {
+            mHasContactPicker = (mContext.getPackageManager().
+                                 queryIntentActivities(contactPickerIntent(), 0).size() > 0);
+        }
+        return mHasContactPicker;
+    }
 }
diff --git a/src/com/fsck/k9/helper/ContactsSdk3_4.java b/src/com/fsck/k9/helper/ContactsSdk3_4.java
index f8cec57fa..c7addc83f 100644
--- a/src/com/fsck/k9/helper/ContactsSdk3_4.java
+++ b/src/com/fsck/k9/helper/ContactsSdk3_4.java
@@ -4,8 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.util.Log;
 import android.provider.Contacts;
+import android.provider.Contacts.ContactMethods;
 import com.fsck.k9.mail.Address;
+import com.fsck.k9.K9;
+
 
 /**
  * Access the contacts on the device using the old API (introduced in SDK 1).
@@ -81,27 +85,6 @@ public class ContactsSdk3_4 extends com.fsck.k9.helper.Contacts {
         mContext.startActivity(contactIntent);
     }
 
-    @Override
-    public String getOwnerName() {
-        String name = null;
-        final Cursor c = mContentResolver.query(
-                             Uri.withAppendedPath(Contacts.People.CONTENT_URI, "owner"),
-                             new String[] {Contacts.ContactMethods.DISPLAY_NAME},
-                             null,
-                             null,
-                             null);
-
-        if (c != null) {
-            if (c.getCount() > 0) {
-                c.moveToFirst();
-                name = c.getString(0);  // owner's display name
-            }
-            c.close();
-        }
-
-        return name;
-    }
-
     @Override
     public boolean isInContacts(final String emailAddress) {
         boolean result = false;
@@ -218,6 +201,47 @@ public class ContactsSdk3_4 extends com.fsck.k9.helper.Contacts {
         }
     }
 
+    @Override
+    public Intent contactPickerIntent() {
+        return new Intent(Intent.ACTION_PICK, Contacts.People.CONTENT_URI);
+    }
+
+    @Override
+    public String getEmailFromContactPicker(final Intent data) {
+        Cursor cursor = null;
+        Cursor cursor2 = null;
+        String email = "";
+
+        try {
+            Uri result = data.getData();
+            cursor = mContentResolver.query(result, null, null, null, null);
+            if (cursor.moveToFirst()) {
+                String emailId = cursor.getString(cursor.getColumnIndex(Contacts.People.PRIMARY_EMAIL_ID));
+                cursor2 = mContext.getContentResolver().query(
+                              ContactMethods.CONTENT_EMAIL_URI,
+                              new String[] { ContactMethods.DATA },
+                              "contact_methods._id=?",
+                              new String[] { emailId },
+                              null);
+
+                if (cursor2.moveToFirst()) {
+                    email = cursor2.getString(0);
+                }
+            }
+        } catch (Exception e) {
+            Log.e(K9.LOG_TAG, "Failed to get email data", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            if (cursor2 != null) {
+                cursor2.close();
+            }
+        }
+
+        return email;
+    }
+
     /**
      * Return a {@link Cursor} instance that can be used to fetch information
      * about the contact with the given email address.
diff --git a/src/com/fsck/k9/helper/ContactsSdk5.java b/src/com/fsck/k9/helper/ContactsSdk5.java
index eec9e5a10..b77539c88 100644
--- a/src/com/fsck/k9/helper/ContactsSdk5.java
+++ b/src/com/fsck/k9/helper/ContactsSdk5.java
@@ -1,16 +1,16 @@
 package com.fsck.k9.helper;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.util.Log;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import com.fsck.k9.mail.Address;
+import com.fsck.k9.K9;
 
 /**
  * Access the contacts on the device using the API introduced with SDK 5.
@@ -85,22 +85,6 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
         mContext.startActivity(contactIntent);
     }
 
-    @Override
-    public String getOwnerName() {
-        String name = null;
-
-        // Get the name of the first account that has one.
-        Account[] accounts = AccountManager.get(mContext).getAccounts();
-        for (final Account account : accounts) {
-            if (account.name != null) {
-                name = account.name;
-                break;
-            }
-        }
-
-        return name;
-    }
-
     @Override
     public boolean isInContacts(final String emailAddress) {
         boolean result = false;
@@ -190,6 +174,41 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
         }
     }
 
+    @Override
+    public Intent contactPickerIntent() {
+        return new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
+    }
+
+    @Override
+    public String getEmailFromContactPicker(final Intent data) {
+        Cursor cursor = null;
+        String email = "";
+
+        try {
+            Uri result = data.getData();
+
+            // Get the contact id from the Uri
+            String id = result.getLastPathSegment();
+            cursor = mContentResolver.query(Email.CONTENT_URI,
+                                            null, Email.CONTACT_ID + "=?", new String[] { id },
+                                            null);
+
+            int emailIdx = cursor.getColumnIndex(Email.DATA);
+
+            if (cursor.moveToFirst()) {
+                email = cursor.getString(emailIdx);
+            }
+        } catch (Exception e) {
+            Log.e(K9.LOG_TAG, "Failed to get email data", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        return email;
+    }
+
     /**
      * Return a {@link Cursor} instance that can be used to fetch information
      * about the contact with the given email address.
diff --git a/src/com/fsck/k9/helper/DateFormatter.java b/src/com/fsck/k9/helper/DateFormatter.java
index f964b2183..784195f37 100644
--- a/src/com/fsck/k9/helper/DateFormatter.java
+++ b/src/com/fsck/k9/helper/DateFormatter.java
@@ -43,6 +43,10 @@ public class DateFormatter {
         }
     };
 
+    public static void clearChosenFormat() {
+        sChosenFormat = null;
+    }
+
     public static DateFormat getDateFormat(Context context, String formatString) {
         java.text.DateFormat dateFormat;
 
@@ -75,10 +79,6 @@ public class DateFormatter {
         return sChosenFormat;
     }
 
-    public static void clearChosenFormat() {
-        sChosenFormat = null;
-    }
-
     public static DateFormat getDateFormat(Context context) {
         String formatString = getFormat(context);
         return getDateFormat(context, formatString);
diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/src/com/fsck/k9/helper/FileBrowserHelper.java
new file mode 100644
index 000000000..ad8d5bfb1
--- /dev/null
+++ b/src/com/fsck/k9/helper/FileBrowserHelper.java
@@ -0,0 +1,134 @@
+package com.fsck.k9.helper;
+
+import java.io.File;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.InputType;
+import android.widget.EditText;
+
+import com.fsck.k9.K9;
+import com.fsck.k9.R;
+
+public class FileBrowserHelper {
+    /**
+     * A string array that specifies the name of the intent to use, and the scheme to use with it
+     * when setting the data for the intent.
+     */
+    private static final String[][] PICK_DIRECTORY_INTENTS = {
+        { "org.openintents.action.PICK_DIRECTORY", "file://" },   // OI File Manager (maybe others)
+        { "com.estrongs.action.PICK_DIRECTORY", "file://" },      // ES File Explorer
+        { Intent.ACTION_PICK, "folder://" },                      // Blackmoon File Browser (maybe others)
+        { "com.androidworkz.action.PICK_DIRECTORY", "file://" }
+    }; // SystemExplorer
+
+    private static FileBrowserHelper sInstance;
+
+    /**
+     * callback class to provide the result of the fallback textedit path dialog
+     */
+    public interface FileBrowserFailOverCallback {
+        /**
+         * the user has entered a path
+         * @param path the path as String
+         */
+        public void onPathEntered(String path);
+        /**
+         * the user has cancel the inputtext dialog
+         */
+        public void onCancel();
+    }
+    /**
+     * factory method
+     *
+     */
+    private FileBrowserHelper() {
+    }
+    public synchronized static FileBrowserHelper getInstance() {
+        if (sInstance == null) {
+            sInstance = new FileBrowserHelper();
+        }
+        return sInstance;
+    }
+
+
+    /**
+     * tries to open known filebrowsers.
+     * If no filebrowser is found and fallback textdialog is shown
+     * @param c the context as activity
+     * @param startPath: the default value, where the filebrowser will start.
+     *      if startPath = null => the default path is used
+     * @param requestcode: the int you will get as requestcode in onActivityResult
+     *      (only used if there is a filebrowser installed)
+     * @param callback: the callback (only used when no filebrowser is installed.
+     *      if a filebrowser is installed => override the onActivtyResult Method
+     *
+     * @return true: if a filebrowser has been found (the result will be in the onActivityResult
+     *          false: a fallback textinput has been shown. The Result will be sent with the callback method
+     *
+     *
+     */
+    public boolean showFileBrowserActivity(Activity c, File startPath, int requestcode, FileBrowserFailOverCallback callback) {
+        boolean success = false;
+
+        if (startPath == null) {
+            startPath = new File(K9.getAttachmentDefaultPath());
+        }
+
+        int listIndex = 0;
+        do {
+            String intentAction = PICK_DIRECTORY_INTENTS[listIndex][0];
+            String uriPrefix = PICK_DIRECTORY_INTENTS[listIndex][1];
+            Intent intent = new Intent(intentAction);
+            intent.setData(Uri.parse(uriPrefix + startPath.getPath()));
+
+            try {
+                c.startActivityForResult(intent, requestcode);
+                success = true;
+            } catch (ActivityNotFoundException e) {
+                // Try the next intent in the list
+                listIndex++;
+            };
+        } while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
+
+        if (listIndex == PICK_DIRECTORY_INTENTS.length) {
+            //No Filebrowser is installed => show a fallback textdialog
+            showPathTextInput(c, startPath, callback);
+            success = false;
+        }
+
+        return success;
+    }
+
+    private void showPathTextInput(final Activity c, final File startPath, final FileBrowserFailOverCallback callback) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(c);
+
+        alert.setTitle(c.getString(R.string.attachment_save_title));
+        alert.setMessage(c.getString(R.string.attachment_save_desc));
+        final EditText input = new EditText(c);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        if (startPath != null)
+            input.setText(startPath.toString());
+        alert.setView(input);
+
+        alert.setPositiveButton(c.getString(R.string.okay_action), new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int whichButton) {
+                String path = input.getText().toString();
+                callback.onPathEntered(path);
+            }
+        });
+
+        alert.setNegativeButton(c.getString(R.string.cancel_action),
+        new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int whichButton) {
+                callback.onCancel();
+            }
+        });
+
+        alert.show();
+    }
+}
diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/src/com/fsck/k9/helper/HtmlConverter.java
index 08ddd057d..80da74c04 100644
--- a/src/com/fsck/k9/helper/HtmlConverter.java
+++ b/src/com/fsck/k9/helper/HtmlConverter.java
@@ -52,14 +52,15 @@ public class HtmlConverter {
      */
     private static class HtmlToTextTagHandler implements Html.TagHandler {
         // List of tags whose content should be ignored.
-        private static final Set<String> TAGS_WITH_IGNORED_CONTENT = Collections.unmodifiableSet(new HashSet<String>() {
-            {
-                add("style");
-                add("script");
-                add("title");
-                add("!");   // comments
-            }
-        });
+        private static final Set<String> TAGS_WITH_IGNORED_CONTENT;
+        static {
+            Set<String> set = new HashSet<String>();
+            set.add("style");
+            set.add("script");
+            set.add("title");
+            set.add("!");   // comments
+            TAGS_WITH_IGNORED_CONTENT = Collections.unmodifiableSet(set);
+        }
 
         @Override
         public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader) {
@@ -123,6 +124,45 @@ public class HtmlConverter {
 
     private static final int MAX_SMART_HTMLIFY_MESSAGE_LENGTH = 1024 * 256 ;
 
+    /**
+     * Naively convert a text string into an HTML document.  This method avoids using regular expressions on the entire
+     * message body to save memory.
+     * @param text Plain text string.
+     * @return HTML string.
+     */
+    private static String simpleTextToHtml(String text) {
+        // Encode HTML entities to make sure we don't display something evil.
+        text = TextUtils.htmlEncode(text);
+
+        StringReader reader = new StringReader(text);
+        StringBuilder buff = new StringBuilder(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH);
+        buff.append("<html><head/><body>");
+
+        int c;
+        try {
+            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 />");
+                    break;
+                case '\r':
+                    break;
+                default:
+                    buff.append((char)c);
+                }//switch
+            }
+        } catch (IOException e) {
+            //Should never happen
+            Log.e(K9.LOG_TAG, "Could not read string to convert text to HTML:", e);
+        }
+
+        buff.append("</body></html>");
+
+        return buff.toString();
+    }
+
     /**
      * Convert a text string into an HTML document. Attempts to do smart replacement for large
      * documents to prevent OOM errors. This method adds headers and footers to create a proper HTML
@@ -136,11 +176,7 @@ public class HtmlConverter {
         // if the message is big and plain text, just do
         // a trivial htmlification
         if (text.length() > MAX_SMART_HTMLIFY_MESSAGE_LENGTH) {
-            return "<html><head/><body>" +
-                   htmlifyMessageHeader() +
-                   text +
-                   htmlifyMessageFooter() +
-                   "</body></html>";
+            return simpleTextToHtml(text);
         }
         StringReader reader = new StringReader(text);
         StringBuilder buff = new StringBuilder(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH);
@@ -148,6 +184,11 @@ public class HtmlConverter {
         try {
             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 />");
+                    break;
                 case '&':
                     buff.append("&amp;");
                     break;
@@ -168,8 +209,14 @@ public class HtmlConverter {
             Log.e(K9.LOG_TAG, "Could not read string to convert text to HTML:", e);
         }
         text = buff.toString();
+
+        // Replace lines of -,= or _ with horizontal rules
         text = text.replaceAll("\\s*([-=_]{30,}+)\\s*", "<hr />");
+
+        // TODO: reverse engineer (or troll history) and document
         text = text.replaceAll("(?m)^([^\r\n]{4,}[\\s\\w,:;+/])(?:\r\n|\n|\r)(?=[a-z]\\S{0,10}[\\s\\n\\r])", "$1 ");
+
+        // Compress four or more newlines down to two newlines
         text = text.replaceAll("(?m)(\r\n|\n|\r){4,}", "\n\n");
 
         StringBuffer sb = new StringBuffer(text.length() + TEXT_TO_HTML_EXTRA_BUFFER_LENGTH);
@@ -1073,19 +1120,14 @@ public class HtmlConverter {
     }
 
     private static String htmlifyMessageHeader() {
-        if (K9.messageViewFixedWidthFont()) {
-            return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; \">";
-        } else {
-            return "<div style=\"white-space: pre-wrap; word-wrap:break-word; \">";
-        }
+        final String font = K9.messageViewFixedWidthFont()
+                            ? "monospace"
+                            : "sans-serif";
+        return "<pre style=\"white-space: pre-wrap; word-wrap:break-word; font-family: " + font + "\">";
     }
 
     private static String htmlifyMessageFooter() {
-        if (K9.messageViewFixedWidthFont()) {
-            return "</pre>";
-        } else {
-            return "</div>";
-        }
+        return "</pre>";
     }
 
     /**
diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java
index 412796336..43b208a77 100644
--- a/src/com/fsck/k9/helper/MessageHelper.java
+++ b/src/com/fsck/k9/helper/MessageHelper.java
@@ -99,4 +99,9 @@ public class MessageHelper {
             return mDateFormat.format(date);
         }
     }
+
+    public void refresh() {
+        mDateFormat = DateFormatter.getDateFormat(mContext);
+        mTodayDateFormat = android.text.format.DateFormat.getTimeFormat(mContext);
+    }
 }
diff --git a/src/com/fsck/k9/helper/Utility.java b/src/com/fsck/k9/helper/Utility.java
index c1faa8d91..832df84db 100644
--- a/src/com/fsck/k9/helper/Utility.java
+++ b/src/com/fsck/k9/helper/Utility.java
@@ -38,7 +38,7 @@ public class Utility {
 
     public static String readInputStream(InputStream in, String encoding) throws IOException {
         InputStreamReader reader = new InputStreamReader(in, encoding);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int count;
         char[] buf = new char[512];
         while ((count = reader.read(buf)) != -1) {
@@ -57,24 +57,25 @@ public class Utility {
     }
 
     /**
-     * Combines the given array of Objects into a single string using the
-     * seperator character and each Object's toString() method. between each
-     * part.
+     * Combines the given array of Objects into a single String using
+     * each Object's toString() method and the separator character
+     * between each part.
      *
      * @param parts
-     * @param seperator
-     * @return
+     * @param separator
+     * @return new String
      */
-    public static String combine(Object[] parts, char seperator) {
+    public static String combine(Object[] parts, char separator) {
         if (parts == null) {
             return null;
+        } else if (parts.length == 0) {
+            return "";
         }
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < parts.length; i++) {
-            sb.append(parts[i].toString());
-            if (i < parts.length - 1) {
-                sb.append(seperator);
-            }
+        StringBuilder sb = new StringBuilder();
+        sb.append(parts[0]);
+        for (int i = 1; i < parts.length; ++i) {
+            sb.append(separator);
+            sb.append(parts[i]);
         }
         return sb.toString();
     }
@@ -107,15 +108,13 @@ public class Utility {
     public static boolean domainFieldValid(EditText view) {
         if (view.getText() != null) {
             String s = view.getText().toString();
-            if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$")) {
+            if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)*[a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?$") &&
+                s.length() <= 253) {
                 return true;
             }
             if (s.matches("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")) {
                 return true;
             }
-            if ((s.equalsIgnoreCase("localhost")) || (s.equalsIgnoreCase("localhost.localdomain"))) {
-                return true;
-            }
         }
         return false;
     }
diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java
index 1ebc5a046..451035b9d 100644
--- a/src/com/fsck/k9/mail/Address.java
+++ b/src/com/fsck/k9/mail/Address.java
@@ -179,7 +179,7 @@ public class Address {
         if (addresses == null) {
             return null;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < addresses.length; i++) {
             sb.append(addresses[i].toString());
             if (i < addresses.length - 1) {
@@ -201,7 +201,7 @@ public class Address {
         if (addresses == null) {
             return null;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < addresses.length; i++) {
             sb.append(addresses[i].toEncodedString());
             if (i < addresses.length - 1) {
diff --git a/src/com/fsck/k9/mail/Authentication.java b/src/com/fsck/k9/mail/Authentication.java
new file mode 100644
index 000000000..4b9ae90ae
--- /dev/null
+++ b/src/com/fsck/k9/mail/Authentication.java
@@ -0,0 +1,85 @@
+package com.fsck.k9.mail;
+
+import java.security.MessageDigest;
+
+import com.fsck.k9.mail.filter.Base64;
+import com.fsck.k9.mail.filter.Hex;
+
+public class Authentication {
+    private static final String US_ASCII = "US-ASCII";
+
+    /**
+     * Computes the response for CRAM-MD5 authentication mechanism given the user credentials and
+     * the server-provided nonce.
+     *
+     * @param username The username.
+     * @param password The password.
+     * @param b64Nonce The nonce as base64-encoded string.
+     * @return The CRAM-MD5 response.
+     *
+     * @throws AuthenticationFailedException If something went wrong.
+     *
+     * @see Authentication#computeCramMd5Bytes(String, String, byte[])
+     */
+    public static String computeCramMd5(String username, String password, String b64Nonce)
+    throws AuthenticationFailedException {
+
+        try {
+            byte[] b64NonceBytes = b64Nonce.getBytes(US_ASCII);
+            byte[] b64CRAM = computeCramMd5Bytes(username, password, b64NonceBytes);
+            return new String(b64CRAM, US_ASCII);
+        } catch (AuthenticationFailedException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new AuthenticationFailedException("This shouldn't happen", e);
+        }
+    }
+
+    /**
+     * Computes the response for CRAM-MD5 authentication mechanism given the user credentials and
+     * the server-provided nonce.
+     *
+     * @param username The username.
+     * @param password The password.
+     * @param b64Nonce The nonce as base64-encoded byte array.
+     * @return The CRAM-MD5 response as byte array.
+     *
+     * @throws AuthenticationFailedException If something went wrong.
+     *
+     * @see <a href="https://tools.ietf.org/html/rfc2195">RFC 2195</a>
+     */
+    public static byte[] computeCramMd5Bytes(String username, String password, byte[] b64Nonce)
+    throws AuthenticationFailedException {
+
+        try {
+            byte[] nonce = Base64.decodeBase64(b64Nonce);
+
+            byte[] secretBytes = password.getBytes(US_ASCII);
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            if (secretBytes.length > 64) {
+                secretBytes = md.digest(secretBytes);
+            }
+
+            byte[] ipad = new byte[64];
+            byte[] opad = new byte[64];
+            System.arraycopy(secretBytes, 0, ipad, 0, secretBytes.length);
+            System.arraycopy(secretBytes, 0, opad, 0, secretBytes.length);
+            for (int i = 0; i < ipad.length; i++) ipad[i] ^= 0x36;
+            for (int i = 0; i < opad.length; i++) opad[i] ^= 0x5c;
+
+            md.update(ipad);
+            byte[] firstPass = md.digest(nonce);
+
+            md.update(opad);
+            byte[] result = md.digest(firstPass);
+
+            String plainCRAM = username + " " + new String(Hex.encodeHex(result));
+            byte[] b64CRAM = Base64.encodeBase64(plainCRAM.getBytes(US_ASCII));
+
+            return b64CRAM;
+
+        } catch (Exception e) {
+            throw new AuthenticationFailedException("Something went wrong during CRAM-MD5 computation", e);
+        }
+    }
+}
diff --git a/src/com/fsck/k9/mail/Folder.java b/src/com/fsck/k9/mail/Folder.java
index 7e338400b..0f5b96060 100644
--- a/src/com/fsck/k9/mail/Folder.java
+++ b/src/com/fsck/k9/mail/Folder.java
@@ -153,9 +153,13 @@ public abstract class Folder {
         return null;
     }
 
+    public boolean isFlagSupported(Flag flag) {
+        return true;
+    }
+
     public boolean supportsFetchingFlags() {
         return true;
-    }//isFlagSupported
+    }
 
     @Override
     public String toString() {
diff --git a/src/com/fsck/k9/mail/Message.java b/src/com/fsck/k9/mail/Message.java
index b5adc6c85..2a8ee2c57 100644
--- a/src/com/fsck/k9/mail/Message.java
+++ b/src/com/fsck/k9/mail/Message.java
@@ -4,8 +4,17 @@ package com.fsck.k9.mail;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import java.io.IOException;
+
+import android.util.Log;
+
 import com.fsck.k9.activity.MessageReference;
+import com.fsck.k9.mail.filter.CountingOutputStream;
+import com.fsck.k9.mail.filter.EOLConvertingOutputStream;
+
 import com.fsck.k9.mail.store.UnavailableStorageException;
+import com.fsck.k9.K9;
+
 
 public abstract class Message implements Part, Body {
     private static final Flag[] EMPTY_FLAG_ARRAY = new Flag[0];
@@ -199,4 +208,20 @@ public abstract class Message implements Part, Body {
         return tmpReference.equals(ref);
     }
 
+    public long calculateSize() {
+        try {
+
+            CountingOutputStream out = new CountingOutputStream();
+            EOLConvertingOutputStream eolOut = new EOLConvertingOutputStream(out);
+            writeTo(eolOut);
+            eolOut.flush();
+            return out.getCount();
+        } catch (IOException e) {
+            Log.e(K9.LOG_TAG, "Failed to calculate a message size: " + e);
+        } catch (MessagingException e) {
+            Log.e(K9.LOG_TAG, "Failed to calculate a message size: " + e);
+        }
+        return 0;
+    }
+
 }
diff --git a/src/com/fsck/k9/mail/filter/Base64.java b/src/com/fsck/k9/mail/filter/Base64.java
index 6c8bf7ac1..fc8bd4682 100644
--- a/src/com/fsck/k9/mail/filter/Base64.java
+++ b/src/com/fsck/k9/mail/filter/Base64.java
@@ -17,11 +17,6 @@
 
 package com.fsck.k9.mail.filter;
 
-import org.apache.commons.codec.BinaryDecoder;
-import org.apache.commons.codec.BinaryEncoder;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
-
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 
@@ -38,7 +33,7 @@ import java.math.BigInteger;
  * @since 1.0-dev
  * @version $Id$
  */
-public class Base64 implements BinaryEncoder, BinaryDecoder {
+public class Base64 {
     /**
      * Chunk size per RFC 2045 section 6.8.
      *
@@ -759,4 +754,16 @@ public class Base64 implements BinaryEncoder, BinaryDecoder {
 
         return resizedBytes;
     }
+
+    static class DecoderException extends Exception {
+        DecoderException(String error) {
+            super(error);
+        }
+    }
+
+    static class EncoderException extends Exception {
+        EncoderException(String error) {
+            super(error);
+        }
+    }
 }
diff --git a/src/com/fsck/k9/mail/filter/CountingOutputStream.java b/src/com/fsck/k9/mail/filter/CountingOutputStream.java
index 19a5d7661..06b335b42 100644
--- a/src/com/fsck/k9/mail/filter/CountingOutputStream.java
+++ b/src/com/fsck/k9/mail/filter/CountingOutputStream.java
@@ -21,4 +21,14 @@ public class CountingOutputStream extends OutputStream {
     public void write(int oneByte) throws IOException {
         mCount++;
     }
+
+    @Override
+    public void write(byte b[], int offset, int len) throws IOException {
+        mCount += len;
+    }
+
+    @Override
+    public void write(byte[] b) throws IOException {
+        mCount += b.length;
+    }
 }
diff --git a/src/com/fsck/k9/mail/filter/Hex.java b/src/com/fsck/k9/mail/filter/Hex.java
new file mode 100644
index 000000000..92022203b
--- /dev/null
+++ b/src/com/fsck/k9/mail/filter/Hex.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.fsck.k9.mail.filter;
+
+/**
+ * This code was copied from the Apache Commons project.
+ * The unnecessary parts have been left out.
+ */
+public class Hex {
+    /**
+     * Used building output as Hex
+     */
+    private static final char[] DIGITS = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
+
+    /**
+     * Converts an array of bytes into an array of characters representing the hexidecimal values of each byte in order.
+     * The returned array will be double the length of the passed array, as it takes two characters to represent any
+     * given byte.
+     *
+     * @param data
+     *                  a byte[] to convert to Hex characters
+     * @return A char[] containing hexidecimal characters
+     */
+    public static char[] encodeHex(byte[] data) {
+
+        int l = data.length;
+
+        char[] out = new char[l << 1];
+
+        // two characters form the hex value.
+        for (int i = 0, j = 0; i < l; i++) {
+            out[j++] = DIGITS[(0xF0 & data[i]) >>> 4 ];
+            out[j++] = DIGITS[ 0x0F & data[i] ];
+        }
+
+        return out;
+    }
+
+}
diff --git a/src/com/fsck/k9/mail/filter/PeekableInputStream.java b/src/com/fsck/k9/mail/filter/PeekableInputStream.java
index 9ef98abe3..0175bc4de 100644
--- a/src/com/fsck/k9/mail/filter/PeekableInputStream.java
+++ b/src/com/fsck/k9/mail/filter/PeekableInputStream.java
@@ -30,7 +30,7 @@ public class PeekableInputStream extends InputStream {
 
     public int peek() throws IOException {
         if (!mPeeked) {
-            mPeekedByte = read();
+            mPeekedByte = mIn.read();
             mPeeked = true;
         }
         return mPeekedByte;
@@ -41,7 +41,7 @@ public class PeekableInputStream extends InputStream {
         if (!mPeeked) {
             return mIn.read(b, offset, length);
         } else {
-            b[0] = (byte)mPeekedByte;
+            b[offset] = (byte)mPeekedByte;
             mPeeked = false;
             int r = mIn.read(b, offset + 1, length - 1);
             if (r == -1) {
diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/src/com/fsck/k9/mail/internet/DecoderUtil.java
index 6580199e9..137ba5e7e 100644
--- a/src/com/fsck/k9/mail/internet/DecoderUtil.java
+++ b/src/com/fsck/k9/mail/internet/DecoderUtil.java
@@ -58,7 +58,7 @@ public class DecoderUtil {
         /*
          * Replace _ with =20
          */
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < encodedWord.length(); i++) {
             char c = encodedWord.charAt(i);
             if (c == '_') {
diff --git a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java
index 804a9434b..0b754a40f 100644
--- a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java
+++ b/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java
@@ -26,7 +26,7 @@ class Iso2022JpToShiftJisInputStream extends InputStream {
         }
 
         int in1 = mIn.read();
-        if (in1 == 0x1b) {
+        while (in1 == 0x1b) {
             in1 = mIn.read();
             if (in1 == '(') {
                 in1 = mIn.read();
diff --git a/src/com/fsck/k9/mail/internet/MimeBodyPart.java b/src/com/fsck/k9/mail/internet/MimeBodyPart.java
index bc8c058f0..70801cc74 100644
--- a/src/com/fsck/k9/mail/internet/MimeBodyPart.java
+++ b/src/com/fsck/k9/mail/internet/MimeBodyPart.java
@@ -77,35 +77,25 @@ public class MimeBodyPart extends BodyPart {
 
     public String getContentType() throws MessagingException {
         String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
-        if (contentType == null) {
-            return "text/plain";
-        } else {
-            return contentType;
-        }
+        return (contentType == null) ? "text/plain" : contentType;
     }
 
     public String getDisposition() throws MessagingException {
-        String contentDisposition = getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
-        if (contentDisposition == null) {
-            return null;
-        } else {
-            return contentDisposition;
-        }
+        return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
     }
 
     public String getContentId() throws MessagingException {
         String contentId = getFirstHeader(MimeHeader.HEADER_CONTENT_ID);
         if (contentId == null) {
             return null;
-        } else {
-            int first = contentId.indexOf('<');
-            int last = contentId.lastIndexOf('>');
-            if (first != -1 && last != -1) {
-                return contentId.substring(first + 1, last);
-            } else {
-                return contentId;
-            }
         }
+
+        int first = contentId.indexOf('<');
+        int last = contentId.lastIndexOf('>');
+
+        return (first != -1 && last != -1) ?
+               contentId.substring(first + 1, last) :
+               contentId;
     }
 
     public String getMimeType() throws MessagingException {
diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java
index 3140f7e59..c6b8510c8 100644
--- a/src/com/fsck/k9/mail/internet/MimeHeader.java
+++ b/src/com/fsck/k9/mail/internet/MimeHeader.java
@@ -101,7 +101,12 @@ public class MimeHeader {
                 String v = field.value;
 
                 if (hasToBeEncoded(v)) {
-                    v = EncoderUtil.encodeEncodedWord(field.value, Charset.forName(mCharset));
+                    Charset charset = null;
+
+                    if (mCharset != null) {
+                        charset = Charset.forName(mCharset);
+                    }
+                    v = EncoderUtil.encodeEncodedWord(field.value, charset);
                 }
 
                 writer.write(field.name + ": " + v + "\r\n");
diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java
index 505d88868..9a89624e5 100644
--- a/src/com/fsck/k9/mail/internet/MimeMessage.java
+++ b/src/com/fsck/k9/mail/internet/MimeMessage.java
@@ -77,6 +77,7 @@ public class MimeMessage extends Message {
         parserConfig.setMaxHeaderLen(-1); // The default is a mere 10k
         parserConfig.setMaxLineLen(-1); // The default is 1000 characters. Some MUAs generate
         // REALLY long References: headers
+        parserConfig.setMaxHeaderCount(-1); // Disable the check for header count.
         MimeStreamParser parser = new MimeStreamParser(parserConfig);
         parser.setContentHandler(new MimeMessageBuilder());
         try {
@@ -130,20 +131,11 @@ public class MimeMessage extends Message {
     @Override
     public String getContentType() throws MessagingException {
         String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
-        if (contentType == null) {
-            return "text/plain";
-        } else {
-            return contentType.toLowerCase();
-        }
+        return (contentType == null) ? "text/plain" : contentType.toLowerCase();
     }
 
     public String getDisposition() throws MessagingException {
-        String contentDisposition = getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
-        if (contentDisposition == null) {
-            return null;
-        } else {
-            return contentDisposition;
-        }
+        return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
     }
     public String getContentId() throws MessagingException {
         return null;
@@ -538,7 +530,7 @@ public class MimeMessage extends Message {
 
         public void epilogue(InputStream is) throws IOException {
             expect(MimeMultipart.class);
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             int b;
             while ((b = is.read()) != -1) {
                 sb.append((char)b);
@@ -548,7 +540,7 @@ public class MimeMessage extends Message {
 
         public void preamble(InputStream is) throws IOException {
             expect(MimeMultipart.class);
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             int b;
             while ((b = is.read()) != -1) {
                 sb.append((char)b);
diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/src/com/fsck/k9/mail/internet/MimeMultipart.java
index 7ee7be0da..212c289c6 100644
--- a/src/com/fsck/k9/mail/internet/MimeMultipart.java
+++ b/src/com/fsck/k9/mail/internet/MimeMultipart.java
@@ -37,7 +37,7 @@ public class MimeMultipart extends Multipart {
     }
 
     public String generateBoundary() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("----");
         for (int i = 0; i < 30; i++) {
             sb.append(Integer.toString((int)(Math.random() * 35), 36));
diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index 34a75ce4c..08c352c03 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -14,6 +14,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
 
 
 public class MimeUtility {
@@ -879,7 +880,15 @@ public class MimeUtility {
     { "zmm", "application/vnd.handheld-entertainment+xml"}
     };
 
-
+    /**
+     * Table for MIME type replacements.
+     *
+     * Table format: wrong type, correct type
+     */
+    private static final String[][] MIME_TYPE_REPLACEMENT_MAP = new String[][] {
+        {"image/jpg", "image/jpeg"},
+        {"image/pjpeg", "image/jpeg"}   // see issue 1712
+    };
 
     public static String unfold(String s) {
         if (s == null) {
@@ -1196,6 +1205,46 @@ public class MimeUtility {
         return DEFAULT_ATTACHMENT_MIME_TYPE;
     }
 
+    /**
+     * Convert some wrong MIME types encountered in the wild to canonical MIME
+     * types.
+     *
+     * @param mimeType The original MIME type
+     * @return If {@code mimeType} is known to be wrong the correct MIME type
+     *         is returned. Otherwise the value of {@code mimeType} is returned
+     *         unmodified.
+     *
+     * @see #MIME_TYPE_REPLACEMENT_MAP
+     */
+    public static String canonicalizeMimeType(String mimeType) {
+        for (String[] mimeTypeMapEntry : MIME_TYPE_REPLACEMENT_MAP) {
+            if (mimeTypeMapEntry[0].equals(mimeType)) {
+                return mimeTypeMapEntry[1];
+            }
+        }
+        return mimeType;
+    }
+
+    /**
+     * When viewing the attachment we want the MIME type to be as sensible as
+     * possible. So we fix it up if necessary.
+     *
+     * @param mimeType The original MIME type of the attachment.
+     * @param name The (file)name of the attachment.
+     *
+     * @return The best MIME type we can come up with.
+     */
+    public static String getMimeTypeForViewing(String mimeType, String name) {
+        if (DEFAULT_ATTACHMENT_MIME_TYPE.equalsIgnoreCase(mimeType)) {
+            // If the MIME type is the generic "application/octet-stream"
+            // we try to find a better one by looking at the file extension.
+            return getMimeTypeByExtension(name);
+        } else {
+            // Some messages contain wrong MIME types. See if we know better.
+            return canonicalizeMimeType(mimeType);
+        }
+    }
+
     private static Message getMessageFromPart(Part part) {
         while (part != null) {
             if (part instanceof Message)
@@ -1337,13 +1386,19 @@ public class MimeUtility {
 
         /*
          * See if there is conversion from the MIME charset to the Java one.
+         * this function may also throw an exception if the charset name is not known
          */
-        if (!Charset.isSupported(charset)) {
+        boolean supported;
+        try {
+            supported = Charset.isSupported(charset);
+        } catch (IllegalCharsetNameException e) {
+            supported = false;
+        }
+        if (!supported) {
             Log.e(K9.LOG_TAG, "I don't know how to deal with the charset " + charset +
             ". Falling back to US-ASCII");
             charset = "US-ASCII";
         }
-
         /*
          * Convert and return as new String
          */
diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java
index 93d9d79a3..e09399772 100644
--- a/src/com/fsck/k9/mail/store/ImapResponseParser.java
+++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java
@@ -15,6 +15,7 @@ public class ImapResponseParser {
     private static final SimpleDateFormat mDateTimeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z", Locale.US);
     private static final SimpleDateFormat badDateTimeFormat = new SimpleDateFormat("dd MMM yyyy HH:mm:ss Z", Locale.US);
     private static final SimpleDateFormat badDateTimeFormat2 = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss Z", Locale.US);
+    private static final SimpleDateFormat badDateTimeFormat3 = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.US);
 
     private PeekableInputStream mIn;
     private ImapResponse mResponse;
@@ -194,7 +195,7 @@ public class ImapResponseParser {
     }
 
     private String parseAtom() throws IOException {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int ch;
         while (true) {
             ch = mIn.peek();
@@ -204,7 +205,7 @@ public class ImapResponseParser {
                        ch == '[' || ch == ']' ||
                        // docs claim that flags are \ atom but atom isn't supposed to
                        // contain
-                       // * and some falgs contain *
+                       // * and some flags contain *
                        // ch == '%' || ch == '*' ||
 //                    ch == '%' ||
                        // TODO probably should not allow \ and should recognize
@@ -280,7 +281,7 @@ public class ImapResponseParser {
     private String parseQuoted() throws IOException {
         expect('"');
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int ch;
         boolean escape = false;
         while ((ch = mIn.read()) != -1) {
@@ -298,7 +299,7 @@ public class ImapResponseParser {
     }
 
     private String readStringUntil(char end) throws IOException {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int ch;
         while ((ch = mIn.read()) != -1) {
             if (ch == end) {
@@ -323,7 +324,7 @@ public class ImapResponseParser {
      * Represents an IMAP list response and is also the base class for the
      * ImapResponse.
      */
-    public class ImapList extends ArrayList<Object> {
+    public static class ImapList extends ArrayList<Object> {
         private static final long serialVersionUID = -4067248341419617583L;
 
         public ImapList getList(int index) {
@@ -347,13 +348,25 @@ public class ImapResponseParser {
         }
 
         public Date getDate(int index) throws MessagingException {
+            return getDate(getString(index));
+        }
+
+        public Date getKeyedDate(Object key) throws MessagingException {
+            return getDate(getKeyedString(key));
+        }
+
+        private Date getDate(String value) throws MessagingException {
             try {
-                return parseDate(getString(index));
+                if (value == null) {
+                    return null;
+                }
+                return parseDate(value);
             } catch (ParseException pe) {
-                throw new MessagingException("Unable to parse IMAP datetime", pe);
+                throw new MessagingException("Unable to parse IMAP datetime '" + value + "' ", pe);
             }
         }
 
+
         public Object getKeyedValue(Object key) {
             for (int i = 0, count = size(); i < count; i++) {
                 if (equalsIgnoreCase(get(i), key)) {
@@ -379,18 +392,6 @@ public class ImapResponseParser {
             return Integer.parseInt(getKeyedString(key));
         }
 
-        public Date getKeyedDate(Object key) throws MessagingException {
-            try {
-                String value = getKeyedString(key);
-                if (value == null) {
-                    return null;
-                }
-                return parseDate(value);
-            } catch (ParseException pe) {
-                throw new MessagingException("Unable to parse IMAP datetime", pe);
-            }
-        }
-
         public boolean containsKey(Object key) {
             if (key == null) {
                 return false;
@@ -426,8 +427,14 @@ public class ImapResponseParser {
                         return badDateTimeFormat.parse(value);
                     }
                 } catch (Exception e2) {
-                    synchronized (badDateTimeFormat2) {
-                        return badDateTimeFormat2.parse(value);
+                    try {
+                        synchronized (badDateTimeFormat2) {
+                            return badDateTimeFormat2.parse(value);
+                        }
+                    } catch (Exception e3) {
+                        synchronized (badDateTimeFormat3) {
+                            return badDateTimeFormat3.parse(value);
+                        }
                     }
                 }
             }
@@ -464,7 +471,7 @@ public class ImapResponseParser {
 
         public String getAlertText() {
             if (size() > 1 && equalsIgnoreCase("[ALERT]", get(1))) {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 for (int i = 2, count = size(); i < count; i++) {
                     sb.append(get(i).toString());
                     sb.append(' ');
diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
index 89836f40c..0a86619a3 100644
--- a/src/com/fsck/k9/mail/store/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -19,10 +19,11 @@ import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
 import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.text.SimpleDateFormat;
@@ -48,9 +49,6 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManager;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Hex;
-
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -65,6 +63,7 @@ import com.fsck.k9.controller.MessageRetrievalListener;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.Authentication;
 import com.fsck.k9.mail.AuthenticationFailedException;
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.CertificateValidationException;
@@ -79,7 +78,6 @@ import com.fsck.k9.mail.PushReceiver;
 import com.fsck.k9.mail.Pusher;
 import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.ServerSettings;
-import com.fsck.k9.mail.filter.CountingOutputStream;
 import com.fsck.k9.mail.filter.EOLConvertingOutputStream;
 import com.fsck.k9.mail.filter.FixedLengthInputStream;
 import com.fsck.k9.mail.filter.PeekableInputStream;
@@ -524,16 +522,31 @@ public class ImapStore extends Store {
         for (ImapResponse response : responses) {
             if (ImapResponseParser.equalsIgnoreCase(response.get(0), commandResponse)) {
                 boolean includeFolder = true;
-                String folder = decodeFolderName(response.getString(3));
+
+                String decodedFolderName;
+                try {
+                    decodedFolderName = decodeFolderName(response.getString(3));
+                } catch (CharacterCodingException e) {
+                    Log.w(K9.LOG_TAG, "Folder name not correctly encoded with the UTF-7 variant " +
+                          "as defined by RFC 3501: " + response.getString(3), e);
+
+                    //TODO: Use the raw name returned by the server for all commands that require
+                    //      a folder name. Use the decoded name only for showing it to the user.
+
+                    // We currently just skip folders with malformed names.
+                    continue;
+                }
+
+                String folder = decodedFolderName;
 
                 if (mPathDelimeter == null) {
                     mPathDelimeter = response.getString(2);
                     mCombinedPrefix = null;
                 }
 
-                if (folder.equalsIgnoreCase(K9.INBOX)) {
+                if (folder.equalsIgnoreCase(mAccount.getInboxFolderName())) {
                     continue;
-                } else if (folder.equalsIgnoreCase(K9.OUTBOX)) {
+                } else if (folder.equals(mAccount.getOutboxFolderName())) {
                     /*
                      * There is a folder on the server with the same name as our local
                      * outbox. Until we have a good plan to deal with this situation
@@ -541,12 +554,13 @@ public class ImapStore extends Store {
                      */
                     continue;
                 } else {
-
-                    if (getCombinedPrefix().length() > 0) {
-                        if (folder.length() >= getCombinedPrefix().length()) {
-                            folder = folder.substring(getCombinedPrefix().length());
+                    int prefixLength = getCombinedPrefix().length();
+                    if (prefixLength > 0) {
+                        // Strip prefix from the folder name
+                        if (folder.length() >= prefixLength) {
+                            folder = folder.substring(prefixLength);
                         }
-                        if (!decodeFolderName(response.getString(3)).equalsIgnoreCase(getCombinedPrefix() + folder)) {
+                        if (!decodedFolderName.equalsIgnoreCase(getCombinedPrefix() + folder)) {
                             includeFolder = false;
                         }
                     }
@@ -564,7 +578,7 @@ public class ImapStore extends Store {
                 }
             }
         }
-        folders.add(getFolder("INBOX"));
+        folders.add(getFolder(mAccount.getInboxFolderName()));
         return folders;
 
     }
@@ -643,14 +657,15 @@ public class ImapStore extends Store {
         }
     }
 
-    private String decodeFolderName(String name) {
+    private String decodeFolderName(String name) throws CharacterCodingException {
         /*
          * Convert the encoded name to US-ASCII, then pass it through the modified UTF-7
          * decoder and return the Unicode String.
          */
         try {
-            byte[] encoded = name.getBytes("US-ASCII");
-            CharBuffer cb = mModifiedUtf7Charset.decode(ByteBuffer.wrap(encoded));
+            // Make sure the decoder throws an exception if it encounters an invalid encoding.
+            CharsetDecoder decoder = mModifiedUtf7Charset.newDecoder().onMalformedInput(CodingErrorAction.REPORT);
+            CharBuffer cb = decoder.decode(ByteBuffer.wrap(name.getBytes("US-ASCII")));
             return cb.toString();
         } catch (UnsupportedEncodingException uee) {
             /*
@@ -699,7 +714,7 @@ public class ImapStore extends Store {
 
         public String getPrefixedName() throws MessagingException {
             String prefixedName = "";
-            if (!K9.INBOX.equalsIgnoreCase(mName)) {
+            if (!mAccount.getInboxFolderName().equalsIgnoreCase(mName)) {
                 ImapConnection connection = null;
                 synchronized (this) {
                     if (mConnection == null) {
@@ -1054,7 +1069,7 @@ public class ImapStore extends Store {
             try {
                 ImapSearcher searcher = new ImapSearcher() {
                     public List<ImapResponse> search() throws IOException, MessagingException {
-                        return executeSimpleCommand(String.format("UID SEARCH *:* "));
+                        return executeSimpleCommand("UID SEARCH *:*");
                     }
                 };
                 Message[] messages = search(searcher, null);
@@ -1241,7 +1256,12 @@ public class ImapStore extends Store {
                 fetchFields.add("BODYSTRUCTURE");
             }
             if (fp.contains(FetchProfile.Item.BODY_SANE)) {
-                fetchFields.add(String.format("BODY.PEEK[]<0.%d>", mAccount.getMaximumAutoDownloadMessageSize()));
+                // If the user wants to download unlimited-size messages, don't go only for the truncated body
+                if (mAccount.getMaximumAutoDownloadMessageSize() > 0) {
+                    fetchFields.add(String.format("BODY.PEEK[]<0.%d>", mAccount.getMaximumAutoDownloadMessageSize()));
+                } else {
+                    fetchFields.add("BODY.PEEK[]");
+                }
             }
             if (fp.contains(FetchProfile.Item.BODY)) {
                 fetchFields.add("BODY.PEEK[]");
@@ -1543,7 +1563,7 @@ public class ImapStore extends Store {
 //                            String key = (String)keyObj;
 //                            if ("ALERT".equalsIgnoreCase(key))
 //                            {
-//                                StringBuffer sb = new StringBuffer();
+//                                StringBuilder sb = new StringBuilder();
 //                                for (int i = 2, count = response.size(); i < count; i++) {
 //                                    sb.append(response.get(i).toString());
 //                                    sb.append(' ');
@@ -1599,16 +1619,21 @@ public class ImapStore extends Store {
                  */
 
                 /*
-                 body type
-                 body subtype
-                 body parameter parenthesized list
-                 body id
-                 body description
-                 body encoding
-                 body size
+                 *  0| 0  body type
+                 *  1| 1  body subtype
+                 *  2| 2  body parameter parenthesized list
+                 *  3| 3  body id (unused)
+                 *  4| 4  body description (unused)
+                 *  5| 5  body encoding
+                 *  6| 6  body size
+                 *  -| 7  text lines (only for type TEXT, unused)
+                 * Extensions (optional):
+                 *  7| 8  body MD5 (unused)
+                 *  8| 9  body disposition
+                 *  9|10  body language (unused)
+                 * 10|11  body location (unused)
                  */
 
-
                 String type = bs.getString(0);
                 String subType = bs.getString(1);
                 String mimeType = (type + "/" + subType).toLowerCase();
@@ -1654,11 +1679,11 @@ public class ImapStore extends Store {
                 // Extension items
                 ImapList bodyDisposition = null;
                 if (("text".equalsIgnoreCase(type))
-                        && (bs.size() > 8)
+                        && (bs.size() > 9)
                         && (bs.get(9) instanceof ImapList)) {
                     bodyDisposition = bs.getList(9);
                 } else if (!("text".equalsIgnoreCase(type))
-                           && (bs.size() > 7)
+                           && (bs.size() > 8)
                            && (bs.get(8) instanceof ImapList)) {
                     bodyDisposition = bs.getList(8);
                 }
@@ -1724,22 +1749,17 @@ public class ImapStore extends Store {
             checkOpen();
             try {
                 for (Message message : messages) {
-                    CountingOutputStream out = new CountingOutputStream();
-                    EOLConvertingOutputStream eolOut = new EOLConvertingOutputStream(out);
-                    message.writeTo(eolOut);
-                    eolOut.flush();
-
                     mConnection.sendCommand(
                         String.format("APPEND %s (%s) {%d}",
                                       encodeString(encodeFolderName(getPrefixedName())),
                                       combineFlags(message.getFlags()),
-                                      out.getCount()), false);
+                                      message.calculateSize()), false);
                     ImapResponse response;
                     do {
                         response = mConnection.readResponse();
                         handleUntaggedResponse(response);
                         if (response.mCommandContinuationRequested) {
-                            eolOut = new EOLConvertingOutputStream(mConnection.mOut);
+                            EOLConvertingOutputStream eolOut = new EOLConvertingOutputStream(mConnection.mOut);
                             message.writeTo(eolOut);
                             eolOut.write('\r');
                             eolOut.write('\n');
@@ -2233,10 +2253,10 @@ public class ImapStore extends Store {
         protected void authCramMD5() throws AuthenticationFailedException, MessagingException {
             try {
                 String tag = sendCommand("AUTHENTICATE CRAM-MD5", false);
-                byte[] buf = new byte[ 1024 ];
+                byte[] buf = new byte[1024];
                 int b64NonceLen = 0;
                 for (int i = 0; i < buf.length; i++) {
-                    buf[ i ] = (byte)mIn.read();
+                    buf[i] = (byte)mIn.read();
                     if (buf[i] == 0x0a) {
                         b64NonceLen = i;
                         break;
@@ -2245,57 +2265,32 @@ public class ImapStore extends Store {
                 if (b64NonceLen == 0) {
                     throw new AuthenticationFailedException("Error negotiating CRAM-MD5: nonce too long.");
                 }
-                byte[] b64NonceTrim = new byte[ b64NonceLen - 2 ];
+                byte[] b64NonceTrim = new byte[b64NonceLen - 2];
                 System.arraycopy(buf, 1, b64NonceTrim, 0, b64NonceLen - 2);
-                byte[] nonce = Base64.decodeBase64(b64NonceTrim);
-                if (K9.DEBUG) {
-                    Log.d(K9.LOG_TAG, "Got nonce: " + new String(b64NonceTrim, "US-ASCII"));
-                    Log.d(K9.LOG_TAG, "Plaintext nonce: " + new String(nonce, "US-ASCII"));
-                }
 
-                byte[] ipad = new byte[64];
-                byte[] opad = new byte[64];
-                byte[] secretBytes = mSettings.getPassword().getBytes("US-ASCII");
-                MessageDigest md = MessageDigest.getInstance("MD5");
-                if (secretBytes.length > 64) {
-                    secretBytes = md.digest(secretBytes);
-                }
-                System.arraycopy(secretBytes, 0, ipad, 0, secretBytes.length);
-                System.arraycopy(secretBytes, 0, opad, 0, secretBytes.length);
-                for (int i = 0; i < ipad.length; i++) ipad[i] ^= 0x36;
-                for (int i = 0; i < opad.length; i++) opad[i] ^= 0x5c;
-                md.update(ipad);
-                byte[] firstPass = md.digest(nonce);
-                md.update(opad);
-                byte[] result = md.digest(firstPass);
-                String plainCRAM = mSettings.getUsername() + " " + new String(Hex.encodeHex(result));
-                byte[] b64CRAM = Base64.encodeBase64(plainCRAM.getBytes("US-ASCII"));
-                if (K9.DEBUG) {
-                    Log.d(K9.LOG_TAG, "Username == " + mSettings.getUsername());
-                    Log.d(K9.LOG_TAG, "plainCRAM: " + plainCRAM);
-                    Log.d(K9.LOG_TAG, "b64CRAM: " + new String(b64CRAM, "US-ASCII"));
-                }
+                byte[] b64CRAM = Authentication.computeCramMd5Bytes(mSettings.getUsername(),
+                                 mSettings.getPassword(), b64NonceTrim);
 
                 mOut.write(b64CRAM);
                 mOut.write(new byte[] { 0x0d, 0x0a });
                 mOut.flush();
+
                 int respLen = 0;
                 for (int i = 0; i < buf.length; i++) {
-                    buf[ i ] = (byte)mIn.read();
+                    buf[i] = (byte)mIn.read();
                     if (buf[i] == 0x0a) {
                         respLen = i;
                         break;
                     }
                 }
+
                 String toMatch = tag + " OK";
                 String respStr = new String(buf, 0, respLen);
                 if (!respStr.startsWith(toMatch)) {
                     throw new AuthenticationFailedException("CRAM-MD5 error: " + respStr);
                 }
             } catch (IOException ioe) {
-                throw new AuthenticationFailedException("CRAM-MD5 Auth Failed.");
-            } catch (NoSuchAlgorithmException nsae) {
-                throw new AuthenticationFailedException("MD5 Not Available.");
+                throw new AuthenticationFailedException("CRAM-MD5 Auth Failed.", ioe);
             }
         }
 
diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index d742c6a8b..38300b2ff 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -5,14 +5,17 @@ import java.io.*;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.regex.Pattern;
 
 import com.fsck.k9.helper.HtmlConverter;
 import org.apache.commons.io.IOUtils;
@@ -31,6 +34,7 @@ import com.fsck.k9.Account;
 import com.fsck.k9.AccountStats;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
 import com.fsck.k9.controller.MessageRemovalListener;
 import com.fsck.k9.controller.MessageRetrievalListener;
 import com.fsck.k9.helper.Utility;
@@ -75,17 +79,19 @@ public class LocalStore extends Store implements Serializable {
 
     private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED, Flag.X_DESTROYED, Flag.SEEN, Flag.FLAGGED };
 
-    private static Set<String> HEADERS_TO_SAVE = new HashSet<String>();
+    private static final Set<String> HEADERS_TO_SAVE;
     static {
-        HEADERS_TO_SAVE.add(K9.IDENTITY_HEADER);
-        HEADERS_TO_SAVE.add("To");
-        HEADERS_TO_SAVE.add("Cc");
-        HEADERS_TO_SAVE.add("From");
-        HEADERS_TO_SAVE.add("In-Reply-To");
-        HEADERS_TO_SAVE.add("References");
-        HEADERS_TO_SAVE.add("Content-ID");
-        HEADERS_TO_SAVE.add("Content-Disposition");
-        HEADERS_TO_SAVE.add("User-Agent");
+        Set<String> set = new HashSet();
+        set.add(K9.IDENTITY_HEADER);
+        set.add("To");
+        set.add("Cc");
+        set.add("From");
+        set.add("In-Reply-To");
+        set.add("References");
+        set.add("Content-ID");
+        set.add("Content-Disposition");
+        set.add("User-Agent");
+        HEADERS_TO_SAVE = Collections.unmodifiableSet(set);
     }
 
     /*
@@ -100,7 +106,7 @@ public class LocalStore extends Store implements Serializable {
     static private String GET_FOLDER_COLS = "id, name, unread_count, visible_limit, last_updated, status, push_state, last_pushed, flagged_count, integrate, top_group, poll_class, push_class, display_class";
 
 
-    protected static final int DB_VERSION = 42;
+    protected static final int DB_VERSION = 43;
 
     protected String uUid = null;
 
@@ -328,6 +334,40 @@ public class LocalStore extends Store implements Serializable {
                             Log.e(K9.LOG_TAG, "Could not replace Preferences in upgrade from DB_VERSION 41", e);
                         }
                     }
+                    if (db.getVersion() < 43) {
+                        try {
+                            // If folder "OUTBOX" (old, v3.800 - v3.802) exists, rename it to
+                            // "K9MAIL_INTERNAL_OUTBOX" (new)
+                            LocalFolder oldOutbox = new LocalFolder("OUTBOX");
+                            if (oldOutbox.exists()) {
+                                ContentValues cv = new ContentValues();
+                                cv.put("name", Account.OUTBOX);
+                                db.update("folders", cv, "name = ?", new String[] { "OUTBOX" });
+                                Log.i(K9.LOG_TAG, "Renamed folder OUTBOX to " + Account.OUTBOX);
+                            }
+
+                            // Check if old (pre v3.800) localized outbox folder exists
+                            String localizedOutbox = K9.app.getString(R.string.special_mailbox_name_outbox);
+                            LocalFolder obsoleteOutbox = new LocalFolder(localizedOutbox);
+                            if (obsoleteOutbox.exists()) {
+                                // Get all messages from the localized outbox ...
+                                Message[] messages = obsoleteOutbox.getMessages(null, false);
+
+                                if (messages.length > 0) {
+                                    // ... and move them to the drafts folder (we don't want to
+                                    // surprise the user by sending potentially very old messages)
+                                    LocalFolder drafts = new LocalFolder(mAccount.getDraftsFolderName());
+                                    obsoleteOutbox.moveMessages(messages, drafts);
+                                }
+
+                                // Now get rid of the localized outbox
+                                obsoleteOutbox.delete();
+                                obsoleteOutbox.delete(true);
+                            }
+                        } catch (Exception e) {
+                            Log.e(K9.LOG_TAG, "Error trying to fix the outbox folders", e);
+                        }
+                    }
                 }
             }
 
@@ -365,7 +405,7 @@ public class LocalStore extends Store implements Serializable {
             Folder.FolderClass pushClass = Folder.FolderClass.SECOND_CLASS;
             boolean inTopGroup = false;
             boolean integrate = false;
-            if (K9.INBOX.equals(name)) {
+            if (mAccount.getInboxFolderName().equals(name)) {
                 displayClass = Folder.FolderClass.FIRST_CLASS;
                 syncClass =  Folder.FolderClass.FIRST_CLASS;
                 pushClass =  Folder.FolderClass.FIRST_CLASS;
@@ -483,9 +523,6 @@ public class LocalStore extends Store implements Serializable {
                     cursor = db.rawQuery("SELECT COUNT(*) FROM messages", null);
                     cursor.moveToFirst();
                     return cursor.getInt(0);   // message count
-
-
-
                 } finally {
                     if (cursor != null) {
                         cursor.close();
@@ -495,8 +532,6 @@ public class LocalStore extends Store implements Serializable {
         });
     }
 
-
-
     public void getMessageCounts(final AccountStats stats) throws MessagingException {
         final Account.FolderMode displayMode = mAccount.getFolderDisplayMode();
 
@@ -505,65 +540,61 @@ public class LocalStore extends Store implements Serializable {
             public Integer doDbWork(final SQLiteDatabase db) {
                 Cursor cursor = null;
                 try {
-                    String baseQuery = "SELECT SUM(unread_count), SUM(flagged_count) FROM folders WHERE ( name != ? AND name != ? AND name != ? AND name != ? AND name != ? ) ";
-                    if (displayMode == Account.FolderMode.NONE) {
-                        cursor = db.rawQuery(baseQuery + "AND (name = ? )", new String[] {
+                    // Always count messages in the INBOX but exclude special folders and possibly
+                    // more (depending on the folder display mode)
+                    String baseQuery = "SELECT SUM(unread_count), SUM(flagged_count) " +
+                                       "FROM folders " +
+                                       "WHERE (name = ?)" +  /* INBOX */
+                                       " OR (" +
+                                       "name NOT IN (?, ?, ?, ?, ?)" +  /* special folders */
+                                       "%s)";  /* placeholder for additional constraints */
 
-                                                 mAccount.getTrashFolderName() != null ? mAccount.getTrashFolderName() : "" ,
-                                                 mAccount.getDraftsFolderName() != null ? mAccount.getDraftsFolderName() : "",
-                                                 mAccount.getSpamFolderName() != null ? mAccount.getSpamFolderName() : "",
-                                                 mAccount.getOutboxFolderName() != null ?  mAccount.getOutboxFolderName() : "",
-                                                 mAccount.getSentFolderName() != null ? mAccount.getSentFolderName() : "",
-                                                 K9.INBOX
-                                             }
+                    List<String> queryParam = new ArrayList<String>();
+                    queryParam.add(mAccount.getInboxFolderName());
 
-                                            );
-                    } else if (displayMode == Account.FolderMode.FIRST_CLASS) {
-                        cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class = ?)", new String[] {
-                                                 mAccount.getTrashFolderName() != null ? mAccount.getTrashFolderName() : "" ,
-                                                 mAccount.getDraftsFolderName() != null ? mAccount.getDraftsFolderName() : "",
-                                                 mAccount.getSpamFolderName() != null ? mAccount.getSpamFolderName() : "",
-                                                 mAccount.getOutboxFolderName() != null ?  mAccount.getOutboxFolderName() : "",
-                                                 mAccount.getSentFolderName() != null ? mAccount.getSentFolderName() : "",
-                                                 K9.INBOX, Folder.FolderClass.FIRST_CLASS.name()
-                                             });
+                    queryParam.add((mAccount.getTrashFolderName() != null) ?
+                                   mAccount.getTrashFolderName() : "");
+                    queryParam.add((mAccount.getDraftsFolderName() != null) ?
+                                   mAccount.getDraftsFolderName() : "");
+                    queryParam.add((mAccount.getSpamFolderName() != null) ?
+                                   mAccount.getSpamFolderName() : "");
+                    queryParam.add((mAccount.getOutboxFolderName() != null) ?
+                                   mAccount.getOutboxFolderName() : "");
+                    queryParam.add((mAccount.getSentFolderName() != null) ?
+                                   mAccount.getSentFolderName() : "");
 
-
-                    } else if (displayMode == Account.FolderMode.FIRST_AND_SECOND_CLASS) {
-                        cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class = ? OR display_class = ? )", new String[] {
-                                                 mAccount.getTrashFolderName() != null ? mAccount.getTrashFolderName() : "" ,
-                                                 mAccount.getDraftsFolderName() != null ? mAccount.getDraftsFolderName() : "",
-                                                 mAccount.getSpamFolderName() != null ? mAccount.getSpamFolderName() : "",
-                                                 mAccount.getOutboxFolderName() != null ?  mAccount.getOutboxFolderName() : "",
-                                                 mAccount.getSentFolderName() != null ? mAccount.getSentFolderName() : "",
-                                                 K9.INBOX, Folder.FolderClass.FIRST_CLASS.name(), Folder.FolderClass.SECOND_CLASS.name()
-                                             });
-                    } else if (displayMode == Account.FolderMode.NOT_SECOND_CLASS) {
-                        cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class != ?)", new String[] {
-
-                                                 mAccount.getTrashFolderName() != null ? mAccount.getTrashFolderName() : "" ,
-                                                 mAccount.getDraftsFolderName() != null ? mAccount.getDraftsFolderName() : "",
-                                                 mAccount.getSpamFolderName() != null ? mAccount.getSpamFolderName() : "",
-                                                 mAccount.getOutboxFolderName() != null ?  mAccount.getOutboxFolderName() : "",
-                                                 mAccount.getSentFolderName() != null ? mAccount.getSentFolderName() : "",
-                                                 K9.INBOX, Folder.FolderClass.SECOND_CLASS.name()
-                                             });
-                    } else if (displayMode == Account.FolderMode.ALL) {
-                        cursor = db.rawQuery(baseQuery,  new String[] {
-
-                                                 mAccount.getTrashFolderName() != null ? mAccount.getTrashFolderName() : "" ,
-                                                 mAccount.getDraftsFolderName() != null ? mAccount.getDraftsFolderName() : "",
-                                                 mAccount.getSpamFolderName() != null ? mAccount.getSpamFolderName() : "",
-                                                 mAccount.getOutboxFolderName() != null ?  mAccount.getOutboxFolderName() : "",
-                                                 mAccount.getSentFolderName() != null ? mAccount.getSentFolderName() : "",
-                                             });
-                    } else {
+                    final String extraWhere;
+                    switch (displayMode) {
+                    case FIRST_CLASS:
+                        // Count messages in the INBOX and non-special first class folders
+                        extraWhere = " AND (display_class = ?)";
+                        queryParam.add(Folder.FolderClass.FIRST_CLASS.name());
+                        break;
+                    case FIRST_AND_SECOND_CLASS:
+                        // Count messages in the INBOX and non-special first and second class folders
+                        extraWhere = " AND (display_class IN (?, ?))";
+                        queryParam.add(Folder.FolderClass.FIRST_CLASS.name());
+                        queryParam.add(Folder.FolderClass.SECOND_CLASS.name());
+                        break;
+                    case NOT_SECOND_CLASS:
+                        // Count messages in the INBOX and non-special non-second-class folders
+                        extraWhere = " AND (display_class != ?)";
+                        queryParam.add(Folder.FolderClass.SECOND_CLASS.name());
+                        break;
+                    case ALL:
+                        // Count messages in the INBOX and non-special folders
+                        extraWhere = "";
+                        break;
+                    default:
                         Log.e(K9.LOG_TAG, "asked to compute account statistics for an impossible folder mode " + displayMode);
                         stats.unreadMessageCount = 0;
                         stats.flaggedMessageCount = 0;
                         return null;
                     }
 
+                    String query = String.format(Locale.US, baseQuery, extraWhere);
+                    cursor = db.rawQuery(query, queryParam.toArray(EMPTY_STRING_ARRAY));
+
                     cursor.moveToFirst();
                     stats.unreadMessageCount = cursor.getInt(0);
                     stats.flaggedMessageCount = cursor.getInt(1);
@@ -817,7 +848,7 @@ public class LocalStore extends Store implements Serializable {
 
         @Override
         public String toString() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append(command);
             sb.append(": ");
             for (String argument : arguments) {
@@ -989,49 +1020,18 @@ public class LocalStore extends Store implements Serializable {
 
     }
 
-    public String getAttachmentType(final String attachmentId) throws UnavailableStorageException {
-        return database.execute(false, new DbCallback<String>() {
-            @Override
-            public String doDbWork(final SQLiteDatabase db) throws WrappedException {
-                Cursor cursor = null;
-                try {
-                    cursor = db.query(
-                                 "attachments",
-                                 new String[] { "mime_type", "name" },
-                                 "id = ?",
-                                 new String[] { attachmentId },
-                                 null,
-                                 null,
-                                 null);
-                    cursor.moveToFirst();
-                    String type = cursor.getString(0);
-                    String name = cursor.getString(1);
-                    cursor.close();
-
-                    if (MimeUtility.DEFAULT_ATTACHMENT_MIME_TYPE.equalsIgnoreCase(type)) {
-                        type = MimeUtility.getMimeTypeByExtension(name);
-                    }
-                    return type;
-                } finally {
-                    if (cursor != null) {
-                        cursor.close();
-                    }
-                }
-            }
-        });
-    }
-
     public AttachmentInfo getAttachmentInfo(final String attachmentId) throws UnavailableStorageException {
         return database.execute(false, new DbCallback<AttachmentInfo>() {
             @Override
             public AttachmentInfo doDbWork(final SQLiteDatabase db) throws WrappedException {
                 String name;
+                String type;
                 int size;
                 Cursor cursor = null;
                 try {
                     cursor = db.query(
                                  "attachments",
-                                 new String[] { "name", "size" },
+                                 new String[] { "name", "size", "mime_type" },
                                  "id = ?",
                                  new String[] { attachmentId },
                                  null,
@@ -1042,9 +1042,11 @@ public class LocalStore extends Store implements Serializable {
                     }
                     name = cursor.getString(0);
                     size = cursor.getInt(1);
+                    type = cursor.getString(2);
                     final AttachmentInfo attachmentInfo = new AttachmentInfo();
                     attachmentInfo.name = name;
                     attachmentInfo.size = size;
+                    attachmentInfo.type = type;
                     return attachmentInfo;
                 } finally {
                     if (cursor != null) {
@@ -1058,6 +1060,7 @@ public class LocalStore extends Store implements Serializable {
     public static class AttachmentInfo {
         public String name;
         public int size;
+        public String type;
     }
 
     public void createFolders(final List<LocalFolder> foldersToCreate, final int visibleLimit) throws UnavailableStorageException {
@@ -1074,14 +1077,14 @@ public class LocalStore extends Store implements Serializable {
                     if (mAccount.isSpecialFolder(name)) {
                         prefHolder.inTopGroup = true;
                         prefHolder.displayClass = LocalFolder.FolderClass.FIRST_CLASS;
-                        if (name.equalsIgnoreCase(K9.INBOX)) {
+                        if (name.equalsIgnoreCase(mAccount.getInboxFolderName())) {
                             prefHolder.integrate = true;
                             prefHolder.pushClass = LocalFolder.FolderClass.FIRST_CLASS;
                         } else {
                             prefHolder.pushClass = LocalFolder.FolderClass.INHERITED;
 
                         }
-                        if (name.equalsIgnoreCase(K9.INBOX) ||
+                        if (name.equalsIgnoreCase(mAccount.getInboxFolderName()) ||
                                 name.equalsIgnoreCase(mAccount.getDraftsFolderName())) {
                             prefHolder.syncClass = LocalFolder.FolderClass.FIRST_CLASS;
                         } else {
@@ -1131,7 +1134,8 @@ public class LocalStore extends Store implements Serializable {
             super(LocalStore.this.mAccount);
             this.mName = name;
 
-            if (K9.INBOX.equals(getName())) {
+            if (LocalStore.this.mAccount.getInboxFolderName().equals(getName())) {
+
                 mSyncClass =  FolderClass.FIRST_CLASS;
                 mPushClass =  FolderClass.FIRST_CLASS;
                 mInTopGroup = true;
@@ -1298,7 +1302,7 @@ public class LocalStore extends Store implements Serializable {
                         }
                         Cursor cursor = null;
                         try {
-                            cursor = db.rawQuery("SELECT COUNT(*) FROM messages WHERE folder_id = ?",
+                            cursor = db.rawQuery("SELECT COUNT(*) FROM messages WHERE deleted = 0 and folder_id = ?",
                                                  new String[] {
                                                      Long.toString(mFolderId)
                                                  });
@@ -1511,19 +1515,19 @@ public class LocalStore extends Store implements Serializable {
             String id = getPrefId();
 
             // there can be a lot of folders.  For the defaults, let's not save prefs, saving space, except for INBOX
-            if (mDisplayClass == FolderClass.NO_CLASS && !K9.INBOX.equals(getName())) {
+            if (mDisplayClass == FolderClass.NO_CLASS && !mAccount.getInboxFolderName().equals(getName())) {
                 editor.remove(id + ".displayMode");
             } else {
                 editor.putString(id + ".displayMode", mDisplayClass.name());
             }
 
-            if (mSyncClass == FolderClass.INHERITED && !K9.INBOX.equals(getName())) {
+            if (mSyncClass == FolderClass.INHERITED && !mAccount.getInboxFolderName().equals(getName())) {
                 editor.remove(id + ".syncMode");
             } else {
                 editor.putString(id + ".syncMode", mSyncClass.name());
             }
 
-            if (mPushClass == FolderClass.SECOND_CLASS && !K9.INBOX.equals(getName())) {
+            if (mPushClass == FolderClass.SECOND_CLASS && !mAccount.getInboxFolderName().equals(getName())) {
                 editor.remove(id + ".pushMode");
             } else {
                 editor.putString(id + ".pushMode", mPushClass.name());
@@ -1700,17 +1704,20 @@ public class LocalStore extends Store implements Serializable {
                                             if (contentUri != null) {
                                                 body = new LocalAttachmentBody(Uri.parse(contentUri), mApplication);
                                             }
+
                                             MimeBodyPart bp = new LocalAttachmentBodyPart(body, id);
-                                            bp.setHeader(MimeHeader.HEADER_CONTENT_TYPE,
-                                                         String.format("%s;\n name=\"%s\"",
-                                                                       type,
-                                                                       name));
                                             bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
-                                            bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION,
-                                                         String.format("%s;\n filename=\"%s\";\n size=%d",
-                                                                       contentDisposition,
-                                                                       name,
-                                                                       size));
+                                            if (name != null) {
+                                                bp.setHeader(MimeHeader.HEADER_CONTENT_TYPE,
+                                                             String.format("%s;\n name=\"%s\"",
+                                                                           type,
+                                                                           name));
+                                                bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION,
+                                                             String.format("%s;\n filename=\"%s\";\n size=%d",
+                                                                           contentDisposition,
+                                                                           name, // TODO: Should use encoded word defined in RFC 2231.
+                                                                           size));
+                                            }
 
                                             bp.setHeader(MimeHeader.HEADER_CONTENT_ID, contentId);
                                             /*
@@ -1785,7 +1792,7 @@ public class LocalStore extends Store implements Serializable {
                     try {
                         Map<Long, LocalMessage> popMessages = new HashMap<Long, LocalMessage>();
                         List<String> ids = new ArrayList<String>();
-                        StringBuffer questions = new StringBuffer();
+                        StringBuilder questions = new StringBuilder();
 
                         for (int i = 0; i < messages.size(); i++) {
                             if (i != 0) {
@@ -2094,11 +2101,20 @@ public class LocalStore extends Store implements Serializable {
                                 ArrayList<Part> attachments = new ArrayList<Part>();
                                 MimeUtility.collectParts(message, viewables, attachments);
 
-                                StringBuffer sbHtml = new StringBuffer();
-                                StringBuffer sbText = new StringBuffer();
+                                StringBuilder sbHtml = new StringBuilder();
+                                StringBuilder sbText = new StringBuilder();
                                 for (Part viewable : viewables) {
                                     try {
                                         String text = MimeUtility.getTextFromPart(viewable);
+
+                                        /*
+                                         * Small hack to make sure the string "null" doesn't end up
+                                         * in one of the StringBuilders.
+                                         */
+                                        if (text == null) {
+                                            text = "";
+                                        }
+
                                         /*
                                          * Anything with MIME type text/html will be stored as such. Anything
                                          * else will be stored as text/plain.
@@ -2198,12 +2214,21 @@ public class LocalStore extends Store implements Serializable {
 
                             MimeUtility.collectParts(message, viewables, attachments);
 
-                            StringBuffer sbHtml = new StringBuffer();
-                            StringBuffer sbText = new StringBuffer();
+                            StringBuilder sbHtml = new StringBuilder();
+                            StringBuilder sbText = new StringBuilder();
                             for (int i = 0, count = viewables.size(); i < count; i++) {
                                 Part viewable = viewables.get(i);
                                 try {
                                     String text = MimeUtility.getTextFromPart(viewable);
+
+                                    /*
+                                     * Small hack to make sure the string "null" doesn't end up
+                                     * in one of the StringBuilders.
+                                     */
+                                    if (text == null) {
+                                        text = "";
+                                    }
+
                                     /*
                                      * Anything with MIME type text/html will be stored as such. Anything
                                      * else will be stored as text/plain.
@@ -2381,7 +2406,9 @@ public class LocalStore extends Store implements Serializable {
                                 if (disposition != null) {
                                     String s = MimeUtility.getHeaderParameter(disposition, "size");
                                     if (s != null) {
-                                        size = Integer.parseInt(s);
+                                        try {
+                                            size = Integer.parseInt(s);
+                                        } catch (NumberFormatException e) { /* Ignore */ }
                                     }
                                 }
                             }
@@ -2397,6 +2424,16 @@ public class LocalStore extends Store implements Serializable {
                             String contentId = MimeUtility.getHeaderParameter(attachment.getContentId(), null);
 
                             String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition());
+                            String dispositionType = contentDisposition;
+
+                            if (dispositionType != null) {
+                                int pos = dispositionType.indexOf(';');
+                                if (pos != -1) {
+                                    // extract the disposition-type, "attachment", "inline" or extension-token (see the RFC 2183)
+                                    dispositionType = dispositionType.substring(0, pos);
+                                }
+                            }
+
                             if (name == null && contentDisposition != null) {
                                 name = MimeUtility.getHeaderParameter(contentDisposition, "filename");
                             }
@@ -2409,7 +2446,7 @@ public class LocalStore extends Store implements Serializable {
                                 cv.put("name", name);
                                 cv.put("mime_type", attachment.getMimeType());
                                 cv.put("content_id", contentId);
-                                cv.put("content_disposition", contentDisposition);
+                                cv.put("content_disposition", dispositionType);
 
                                 attachmentId = db.insert("attachments", "message_id", cv);
                             } else {
@@ -2440,16 +2477,18 @@ public class LocalStore extends Store implements Serializable {
                                                          { Long.toString(messageId) }, null, null, null);
                                 try {
                                     if (cursor.moveToNext()) {
-                                        String new_html;
+                                        String htmlContent = cursor.getString(0);
 
-                                        new_html = cursor.getString(0);
-                                        new_html = new_html.replaceAll("cid:" + contentId,
-                                                                       contentUri.toString());
+                                        if (htmlContent != null) {
+                                            String newHtmlContent = htmlContent.replaceAll(
+                                                                        Pattern.quote("cid:" + contentId),
+                                                                        contentUri.toString());
 
-                                        ContentValues cv = new ContentValues();
-                                        cv.put("html_content", new_html);
-                                        db.update("messages", cv, "id = ?", new String[]
-                                                  { Long.toString(messageId) });
+                                            ContentValues cv = new ContentValues();
+                                            cv.put("html_content", newHtmlContent);
+                                            db.update("messages", cv, "id = ?", new String[]
+                                                      { Long.toString(messageId) });
+                                        }
                                     }
                                 } finally {
                                     if (cursor != null) {
@@ -2565,6 +2604,7 @@ public class LocalStore extends Store implements Serializable {
             setPushState(null);
             setLastPush(0);
             setLastChecked(0);
+            setVisibleLimit(mAccount.getDisplayCount());
         }
 
         private void resetUnreadAndFlaggedCounts() {
@@ -2720,19 +2760,26 @@ public class LocalStore extends Store implements Serializable {
                 text = text.substring(0, 8192);
             }
 
-
+            // try to remove lines of dashes in the preview
             text = text.replaceAll("(?m)^----.*?$", "");
+            // remove quoted text from the preview
             text = text.replaceAll("(?m)^[#>].*$", "");
+            // Remove a common quote header from the preview
             text = text.replaceAll("(?m)^On .*wrote.?$", "");
+            // Remove a more generic quote header from the preview
             text = text.replaceAll("(?m)^.*\\w+:$", "");
+
+            // URLs in the preview should just be shown as "..." - They're not
+            // clickable and they usually overwhelm the preview
             text = text.replaceAll("https?://\\S+", "...");
+            // Don't show newlines in the preview
             text = text.replaceAll("(\\r|\\n)+", " ");
+            // Collapse whitespace in the preview
             text = text.replaceAll("\\s+", " ");
             if (text.length() <= 512) {
                 return text;
             } else {
-                text = text.substring(0, 512);
-                return text;
+                return text.substring(0, 512);
             }
 
         }
diff --git a/src/com/fsck/k9/mail/store/LockableDatabase.java b/src/com/fsck/k9/mail/store/LockableDatabase.java
index 4662dc708..e39d56211 100644
--- a/src/com/fsck/k9/mail/store/LockableDatabase.java
+++ b/src/com/fsck/k9/mail/store/LockableDatabase.java
@@ -399,7 +399,7 @@ public class LockableDatabase {
         databaseFile = storageManager.getDatabase(uUid, providerId);
         databaseParentDir = databaseFile.getParentFile();
         if (databaseParentDir.isFile()) {
-            // should be safe to inconditionally delete clashing file: user is not supposed to mess with our directory
+            // should be safe to unconditionally delete clashing file: user is not supposed to mess with our directory
             databaseParentDir.delete();
         }
         if (!databaseParentDir.exists()) {
diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java
index 353c452e3..9deb5b3ea 100644
--- a/src/com/fsck/k9/mail/store/Pop3Store.java
+++ b/src/com/fsck/k9/mail/store/Pop3Store.java
@@ -34,6 +34,24 @@ public class Pop3Store extends Store {
     public static final int CONNECTION_SECURITY_SSL_REQUIRED = 3;
     public static final int CONNECTION_SECURITY_SSL_OPTIONAL = 4;
 
+    private static final String STLS_COMMAND = "STLS";
+    private static final String USER_COMMAND = "USER";
+    private static final String PASS_COMMAND = "PASS";
+    private static final String CAPA_COMMAND = "CAPA";
+    private static final String STAT_COMMAND = "STAT";
+    private static final String LIST_COMMAND = "LIST";
+    private static final String UIDL_COMMAND = "UIDL";
+    private static final String TOP_COMMAND = "TOP";
+    private static final String RETR_COMMAND = "RETR";
+    private static final String DELE_COMMAND = "DELE";
+    private static final String QUIT_COMMAND = "QUIT";
+
+    private static final String STLS_CAPABILITY = "STLS";
+    private static final String UIDL_CAPABILITY = "UIDL";
+    private static final String PIPELINING_CAPABILITY = "PIPELINING";
+    private static final String USER_CAPABILITY = "USER";
+    private static final String TOP_CAPABILITY = "TOP";
+
     private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED };
 
     /**
@@ -88,12 +106,19 @@ public class Pop3Store extends Store {
             port = pop3Uri.getPort();
         }
 
+        String authType = "";
         if (pop3Uri.getUserInfo() != null) {
             try {
+                int userIndex = 0, passwordIndex = 1;
                 String[] userInfoParts = pop3Uri.getUserInfo().split(":");
-                username = URLDecoder.decode(userInfoParts[0], "UTF-8");
-                if (userInfoParts.length > 1) {
-                    password = URLDecoder.decode(userInfoParts[1], "UTF-8");
+                if (userInfoParts.length > 2) {
+                    userIndex++;
+                    passwordIndex++;
+                    authType = userInfoParts[0];
+                }
+                username = URLDecoder.decode(userInfoParts[userIndex], "UTF-8");
+                if (userInfoParts.length > passwordIndex) {
+                    password = URLDecoder.decode(userInfoParts[passwordIndex], "UTF-8");
                 }
             } catch (UnsupportedEncodingException enc) {
                 // This shouldn't happen since the encoding is hardcoded to UTF-8
@@ -101,7 +126,7 @@ public class Pop3Store extends Store {
             }
         }
 
-        return new ServerSettings(STORE_TYPE, host, port, connectionSecurity, null, username,
+        return new ServerSettings(STORE_TYPE, host, port, connectionSecurity, authType, username,
                 password);
     }
 
@@ -162,10 +187,18 @@ public class Pop3Store extends Store {
     private int mPort;
     private String mUsername;
     private String mPassword;
+    private boolean useCramMd5;
     private int mConnectionSecurity;
     private HashMap<String, Folder> mFolders = new HashMap<String, Folder>();
     private Pop3Capabilities mCapabilities;
 
+    /**
+     * This value is {@code true} if the server supports the CAPA command but doesn't advertise
+     * support for the TOP command OR if the server doesn't support the CAPA command and we
+     * already unsuccessfully tried to use the TOP command.
+     */
+    private boolean mTopNotSupported;
+
 
     public Pop3Store(Account account) throws MessagingException {
         super(account);
@@ -215,13 +248,13 @@ public class Pop3Store extends Store {
     @Override
     public List <? extends Folder > getPersonalNamespaces(boolean forceListAll) throws MessagingException {
         List<Folder> folders = new LinkedList<Folder>();
-        folders.add(getFolder("INBOX"));
+        folders.add(getFolder(mAccount.getInboxFolderName()));
         return folders;
     }
 
     @Override
     public void checkSettings() throws MessagingException {
-        Pop3Folder folder = new Pop3Folder("INBOX");
+        Pop3Folder folder = new Pop3Folder(mAccount.getInboxFolderName());
         folder.open(OpenMode.READ_WRITE);
         if (!mCapabilities.uidl) {
             /*
@@ -233,7 +266,7 @@ public class Pop3Store extends Store {
              * If the server doesn't support UIDL it will return a - response, which causes
              * executeSimpleCommand to throw a MessagingException, exiting this method.
              */
-            folder.executeSimpleCommand("UIDL");
+            folder.executeSimpleCommand(UIDL_COMMAND);
 
         }
         folder.close();
@@ -252,8 +285,9 @@ public class Pop3Store extends Store {
         public Pop3Folder(String name) {
             super(Pop3Store.this.mAccount);
             this.mName = name;
-            if (mName.equalsIgnoreCase("INBOX")) {
-                mName = "INBOX";
+
+            if (mName.equalsIgnoreCase(mAccount.getInboxFolderName())) {
+                mName = mAccount.getInboxFolderName();
             }
         }
 
@@ -263,7 +297,7 @@ public class Pop3Store extends Store {
                 return;
             }
 
-            if (!mName.equalsIgnoreCase("INBOX")) {
+            if (!mName.equalsIgnoreCase(mAccount.getInboxFolderName())) {
                 throw new MessagingException("Folder does not exist");
             }
 
@@ -298,7 +332,7 @@ public class Pop3Store extends Store {
                     mCapabilities = getCapabilities();
 
                     if (mCapabilities.stls) {
-                        writeLine("STLS");
+                        writeLine(STLS_COMMAND);
 
                         SSLContext sslContext = SSLContext.getInstance("TLS");
                         boolean secure = mConnectionSecurity == CONNECTION_SECURITY_TLS_REQUIRED;
@@ -318,11 +352,23 @@ public class Pop3Store extends Store {
                     }
                 }
 
-                try {
-                    executeSimpleCommand("USER " + mUsername);
-                    executeSimpleCommand("PASS " + mPassword, true);
-                } catch (MessagingException me) {
-                    throw new AuthenticationFailedException(null, me);
+                if (useCramMd5) {
+                    try {
+                        String b64Nonce = executeSimpleCommand("AUTH CRAM-MD5").replace("+ ", "");
+
+                        String b64CRAM = Authentication.computeCramMd5(mUsername, mPassword, b64Nonce);
+                        executeSimpleCommand(b64CRAM);
+
+                    } catch (MessagingException me) {
+                        throw new AuthenticationFailedException(null, me);
+                    }
+                } else {
+                    try {
+                        executeSimpleCommand(USER_COMMAND + " " + mUsername);
+                        executeSimpleCommand(PASS_COMMAND + " " + mPassword, true);
+                    } catch (MessagingException me) {
+                        throw new AuthenticationFailedException(null, me);
+                    }
                 }
 
                 mCapabilities = getCapabilities();
@@ -335,7 +381,7 @@ public class Pop3Store extends Store {
                 throw new MessagingException("Unable to open connection to POP server.", ioe);
             }
 
-            String response = executeSimpleCommand("STAT");
+            String response = executeSimpleCommand(STAT_COMMAND);
             String[] parts = response.split(" ");
             mMessageCount = Integer.parseInt(parts[1]);
 
@@ -358,7 +404,9 @@ public class Pop3Store extends Store {
         @Override
         public void close() {
             try {
-                executeSimpleCommand("QUIT");
+                if (isOpen()) {
+                    executeSimpleCommand(QUIT_COMMAND);
+                }
             } catch (Exception e) {
                 /*
                  * QUIT may fail if the connection is already closed. We don't care. It's just
@@ -408,7 +456,7 @@ public class Pop3Store extends Store {
 
         @Override
         public boolean exists() throws MessagingException {
-            return mName.equalsIgnoreCase("INBOX");
+            return mName.equalsIgnoreCase(mAccount.getInboxFolderName());
         }
 
         @Override
@@ -498,7 +546,7 @@ public class Pop3Store extends Store {
                 for (int msgNum = start; msgNum <= end; msgNum++) {
                     Pop3Message message = mMsgNumToMsgMap.get(msgNum);
                     if (message == null) {
-                        String response = executeSimpleCommand("UIDL " + msgNum);
+                        String response = executeSimpleCommand(UIDL_COMMAND + " " + msgNum);
                         int uidIndex = response.lastIndexOf(' ');
                         String msgUid = response.substring(uidIndex + 1);
                         message = new Pop3Message(msgUid, this);
@@ -506,12 +554,24 @@ public class Pop3Store extends Store {
                     }
                 }
             } else {
-                String response = executeSimpleCommand("UIDL");
+                String response = executeSimpleCommand(UIDL_COMMAND);
                 while ((response = readLine()) != null) {
                     if (response.equals(".")) {
                         break;
                     }
-                    String[] uidParts = response.split(" ");
+
+                    /*
+                     * Yet another work-around for buggy server software:
+                     * split the response into message number and unique identifier, no matter how many spaces it has
+                     *
+                     * Example for a malformed response:
+                     * 1   2011071307115510400ae3e9e00bmu9
+                     *
+                     * Note the three spaces between message number and unique identifier.
+                     * See issue 3546
+                     */
+
+                    String[] uidParts = response.split(" +");
                     if ((uidParts.length >= 3) && "+OK".equals(uidParts[0])) {
                         /*
                          * At least one server software places a "+OK" in
@@ -557,7 +617,7 @@ public class Pop3Store extends Store {
              * get them is to do a full UIDL list. A possible optimization
              * would be trying UIDL for the latest X messages and praying.
              */
-            String response = executeSimpleCommand("UIDL");
+            String response = executeSimpleCommand(UIDL_COMMAND);
             while ((response = readLine()) != null) {
                 if (response.equals(".")) {
                     break;
@@ -655,8 +715,12 @@ public class Pop3Store extends Store {
                          * To convert the suggested download size we take the size
                          * divided by the maximum line size (76).
                          */
-                        fetchBody(pop3Message,
-                                  (mAccount.getMaximumAutoDownloadMessageSize() / 76));
+                        if (mAccount.getMaximumAutoDownloadMessageSize() > 0) {
+                            fetchBody(pop3Message,
+                                      (mAccount.getMaximumAutoDownloadMessageSize() / 76));
+                        } else {
+                            fetchBody(pop3Message, -1);
+                        }
                     } else if (fp.contains(FetchProfile.Item.STRUCTURE)) {
                         /*
                          * If the user is requesting STRUCTURE we are required to set the body
@@ -698,7 +762,7 @@ public class Pop3Store extends Store {
                     if (listener != null) {
                         listener.messageStarted(pop3Message.getUid(), i, count);
                     }
-                    String response = executeSimpleCommand(String.format("LIST %d",
+                    String response = executeSimpleCommand(String.format(LIST_COMMAND + " %d",
                                                            mUidToMsgNumMap.get(pop3Message.getUid())));
                     String[] listParts = response.split(" ");
                     //int msgNum = Integer.parseInt(listParts[1]);
@@ -714,7 +778,7 @@ public class Pop3Store extends Store {
                     msgUidIndex.add(message.getUid());
                 }
                 int i = 0, count = messages.length;
-                String response = executeSimpleCommand("LIST");
+                String response = executeSimpleCommand(LIST_COMMAND);
                 while ((response = readLine()) != null) {
                     if (response.equals(".")) {
                         break;
@@ -738,43 +802,69 @@ public class Pop3Store extends Store {
         }
 
         /**
-         * Fetches the body of the given message, limiting the stored data
-         * to the specified number of lines. If lines is -1 the entire message
-         * is fetched. This is implemented with RETR for lines = -1 or TOP
-         * for any other value. If the server does not support TOP it is
-         * emulated with RETR and extra lines are thrown away.
-         * @param message
-         * @param lines
+         * Fetches the body of the given message, limiting the downloaded data to the specified
+         * number of lines if possible.
+         *
+         * If lines is -1 the entire message is fetched. This is implemented with RETR for
+         * lines = -1 or TOP for any other value. If the server does not support TOP, RETR is used
+         * instead.
          */
         private void fetchBody(Pop3Message message, int lines)
         throws IOException, MessagingException {
             String response = null;
-            if (lines == -1 || !mCapabilities.top) {
-                response = executeSimpleCommand(String.format("RETR %d",
-                                                mUidToMsgNumMap.get(message.getUid())));
-            } else {
-                response = executeSimpleCommand(String.format("TOP %d %d",
-                                                mUidToMsgNumMap.get(message.getUid()),
-                                                lines));
-            }
-            if (response != null) {
+
+            // Try hard to use the TOP command if we're not asked to download the whole message.
+            if (lines != -1 && (!mTopNotSupported || mCapabilities.top)) {
                 try {
-                    message.parse(new Pop3ResponseInputStream(mIn));
-                    if (lines == -1 || !mCapabilities.top) {
-                        message.setFlag(Flag.X_DOWNLOADED_FULL, true);
+                    if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3 && !mCapabilities.top) {
+                        Log.d(K9.LOG_TAG, "This server doesn't support the CAPA command. " +
+                              "Checking to see if the TOP command is supported nevertheless.");
                     }
-                } catch (MessagingException me) {
-                    /*
-                     * If we're only downloading headers it's possible
-                     * we'll get a broken MIME message which we're not
-                     * real worried about. If we've downloaded the body
-                     * and can't parse it we need to let the user know.
-                     */
-                    if (lines == -1) {
-                        throw me;
+
+                    response = executeSimpleCommand(String.format(TOP_COMMAND + " %d %d",
+                                                    mUidToMsgNumMap.get(message.getUid()), lines));
+
+                    // TOP command is supported. Remember this for the next time.
+                    mCapabilities.top = true;
+                } catch (Pop3ErrorResponse e) {
+                    if (mCapabilities.top) {
+                        // The TOP command should be supported but something went wrong.
+                        throw e;
+                    } else {
+                        if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3) {
+                            Log.d(K9.LOG_TAG, "The server really doesn't support the TOP " +
+                                  "command. Using RETR instead.");
+                        }
+
+                        // Don't try to use the TOP command again.
+                        mTopNotSupported = true;
                     }
                 }
             }
+
+            if (response == null) {
+                response = executeSimpleCommand(String.format(RETR_COMMAND + " %d",
+                                                mUidToMsgNumMap.get(message.getUid())));
+            }
+
+            try {
+                message.parse(new Pop3ResponseInputStream(mIn));
+
+                // TODO: if we've received fewer lines than requested we also have the complete message.
+                if (lines == -1 || !mCapabilities.top) {
+                    message.setFlag(Flag.X_DOWNLOADED_FULL, true);
+                }
+            } catch (MessagingException me) {
+                /*
+                 * If we're only downloading headers it's possible
+                 * we'll get a broken MIME message which we're not
+                 * real worried about. If we've downloaded the body
+                 * and can't parse it we need to let the user know.
+                 */
+                if (lines == -1) {
+                    throw me;
+                }
+            }
         }
 
         @Override
@@ -801,10 +891,8 @@ public class Pop3Store extends Store {
         }
 
         @Override
-        public void setFlags(Flag[] flags, boolean value)
-        throws MessagingException {
-            Message[] messages = getMessages(null);
-            setFlags(messages, flags, value);
+        public void setFlags(Flag[] flags, boolean value) throws MessagingException {
+            throw new UnsupportedOperationException("POP3: No setFlags(Flag[],boolean)");
         }
 
         @Override
@@ -835,12 +923,12 @@ public class Pop3Store extends Store {
                     me.setPermanentFailure(true);
                     throw me;
                 }
-                executeSimpleCommand(String.format("DELE %s", msgNum));
+                executeSimpleCommand(String.format(DELE_COMMAND + " %s", msgNum));
             }
         }
 
         private String readLine() throws IOException {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             int d = mIn.read();
             if (d == -1) {
                 throw new IOException("End of stream reached while trying to read line.");
@@ -871,23 +959,31 @@ public class Pop3Store extends Store {
         private Pop3Capabilities getCapabilities() throws IOException {
             Pop3Capabilities capabilities = new Pop3Capabilities();
             try {
-                String response = executeSimpleCommand("CAPA");
+                String response = executeSimpleCommand(CAPA_COMMAND);
                 while ((response = readLine()) != null) {
                     if (response.equals(".")) {
                         break;
                     }
-                    if (response.equalsIgnoreCase("STLS")) {
+                    if (response.equalsIgnoreCase(STLS_CAPABILITY)) {
                         capabilities.stls = true;
-                    } else if (response.equalsIgnoreCase("UIDL")) {
+                    } else if (response.equalsIgnoreCase(UIDL_CAPABILITY)) {
                         capabilities.uidl = true;
-                    } else if (response.equalsIgnoreCase("PIPELINING")) {
+                    } else if (response.equalsIgnoreCase(PIPELINING_CAPABILITY)) {
                         capabilities.pipelining = true;
-                    } else if (response.equalsIgnoreCase("USER")) {
+                    } else if (response.equalsIgnoreCase(USER_CAPABILITY)) {
                         capabilities.user = true;
-                    } else if (response.equalsIgnoreCase("TOP")) {
+                    } else if (response.equalsIgnoreCase(TOP_CAPABILITY)) {
                         capabilities.top = true;
                     }
                 }
+
+                if (!capabilities.top) {
+                    /*
+                     * If the CAPA command is supported but it doesn't advertise support for the
+                     * TOP command, we won't check for it manually.
+                     */
+                    mTopNotSupported = true;
+                }
             } catch (MessagingException me) {
                 /*
                  * The server may not support the CAPA command, so we just eat this Exception
@@ -920,7 +1016,7 @@ public class Pop3Store extends Store {
 
                 String response = readLine();
                 if (response.length() > 1 && response.charAt(0) == '-') {
-                    throw new MessagingException(response);
+                    throw new Pop3ErrorResponse(response);
                 }
 
                 return response;
@@ -932,6 +1028,11 @@ public class Pop3Store extends Store {
             }
         }
 
+        @Override
+        public boolean isFlagSupported(Flag flag) {
+            return (flag == Flag.DELETED);
+        }
+
         @Override
         public boolean supportsFetchingFlags() {
             return false;
@@ -983,7 +1084,7 @@ public class Pop3Store extends Store {
             //   }
 //         catch (MessagingException me)
 //         {
-//          Log.w(K9.LOG_TAG, "Could not delete non-existant message", me);
+//          Log.w(K9.LOG_TAG, "Could not delete non-existent message", me);
 //         }
         }
     }
@@ -1035,4 +1136,13 @@ public class Pop3Store extends Store {
             return d;
         }
     }
+
+    /**
+     * Exception that is thrown if the server returns an error response.
+     */
+    static class Pop3ErrorResponse extends MessagingException {
+        public Pop3ErrorResponse(String message) {
+            super(message, true);
+        }
+    }
 }
diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index f3bae3174..ef9a6278e 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -4,7 +4,6 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.R;
 import com.fsck.k9.controller.MessageRetrievalListener;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
@@ -52,6 +51,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Locale;
 import java.util.Stack;
 import java.util.zip.GZIPInputStream;
 
@@ -82,8 +82,15 @@ public class WebDavStore extends Store {
 
     private static final Message[] EMPTY_MESSAGE_ARRAY = new Message[0];
 
+    // These are the ids used from Exchange server to identify the special folders
+    // http://social.technet.microsoft.com/Forums/en/exchangesvrdevelopment/thread/1cd2e98c-8a12-44bd-a3e3-9c5ee9e4e14d
+    private static final String DAV_MAIL_INBOX_FOLDER = "inbox";
+    private static final String DAV_MAIL_DRAFTS_FOLDER = "drafts";
+    private static final String DAV_MAIL_SPAM_FOLDER = "junkemail";
     private static final String DAV_MAIL_SEND_FOLDER = "##DavMailSubmissionURI##";
-    private static final String DAV_MAIL_TMP_FOLDER = "drafts";
+    private static final String DAV_MAIL_TRASH_FOLDER = "deleteditems";
+    private static final String DAV_MAIL_OUTBOX_FOLDER = "outbox";
+    private static final String DAV_MAIL_SENT_FOLDER = "sentitems";
 
 
     /**
@@ -304,6 +311,7 @@ public class WebDavStore extends Store {
     private String mPath; /* Stores the path for the server */
     private String mAuthPath; /* Stores the path off of the server to post data to for form based authentication */
     private String mMailboxPath; /* Stores the user specified path to the mailbox */
+    private URI mUri; /* Stores the Uniform Resource Indicator with all connection info */
 
     private boolean mSecure;
     private WebDavHttpClient mHttpClient = null;
@@ -313,8 +321,10 @@ public class WebDavStore extends Store {
     private short mAuthentication = AUTH_TYPE_NONE;
     private String mCachedLoginUrl;
 
+    private Folder mSendFolder = null;
     private HashMap<String, WebDavFolder> mFolderList = new HashMap<String, WebDavFolder>();
 
+
     public WebDavStore(Account account) throws MessagingException {
         super(account);
 
@@ -403,63 +413,136 @@ public class WebDavStore extends Store {
     @Override
     public List <? extends Folder > getPersonalNamespaces(boolean forceListAll) throws MessagingException {
         LinkedList<Folder> folderList = new LinkedList<Folder>();
-        HashMap<String, String> headers = new HashMap<String, String>();
-        DataSet dataset = new DataSet();
-        String messageBody;
-        String[] folderUrls;
-        int urlLength;
-
-        String translatedInbox = K9.app.getString(R.string.special_mailbox_name_inbox);
-
         /**
          * We have to check authentication here so we have the proper URL stored
          */
         getHttpClient();
-        messageBody = getFolderListXml();
+
+        /**
+         *  Firstly we get the "special" folders list (inbox, outbox, etc)
+         *  and setup the account accordingly
+         */
+        HashMap<String, String> headers = new HashMap<String, String>();
+        DataSet dataset = new DataSet();
+        headers.put("Depth", "0");
         headers.put("Brief", "t");
-        dataset = processRequest(this.mUrl, "SEARCH", messageBody, headers);
+        dataset = processRequest(this.mUrl, "PROPFIND", getSpecialFoldersList(), headers);
 
-        folderUrls = dataset.getHrefs();
-        urlLength = folderUrls.length;
+        HashMap<String, String> specialFoldersMap = dataset.getSpecialFolderToUrl();
+        String folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_INBOX_FOLDER));
+        if (folderName != null) {
+            mAccount.setAutoExpandFolderName(folderName);
+            mAccount.setInboxFolderName(folderName);
+        }
 
-        for (int i = 0; i < urlLength; i++) {
-            String[] urlParts = folderUrls[i].split("/");
-            String folderName = urlParts[urlParts.length - 1];
-            String fullPathName = "";
-            WebDavFolder wdFolder;
+        folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_DRAFTS_FOLDER));
+        if (folderName != null)
+            mAccount.setDraftsFolderName(folderName);
 
-            // Check each Exchange folder name to see if it is the user's inbox.
-            // We will check for the default English inbox ("Inbox"), and the user's
-            // translation for "Inbox", in case the user is using a non-English
-            // version of Exchange.
-            if (folderName.equalsIgnoreCase("Inbox") ||
-                    folderName.equalsIgnoreCase(translatedInbox)) {
-                folderName = K9.INBOX;
-            } else {
-                for (int j = 5, count = urlParts.length; j < count; j++) {
-                    if (j != 5) {
-                        fullPathName = fullPathName + "/" + urlParts[j];
-                    } else {
-                        fullPathName = urlParts[j];
-                    }
-                }
-                try {
-                    folderName = java.net.URLDecoder.decode(fullPathName, "UTF-8");
-                } catch (UnsupportedEncodingException uee) {
-                    /** If we don't support UTF-8 there's a problem, don't decode it then */
-                    folderName = fullPathName;
-                }
-            }
+        folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_TRASH_FOLDER));
+        if (folderName != null)
+            mAccount.setTrashFolderName(folderName);
 
-            wdFolder = new WebDavFolder(this, folderName);
-            wdFolder.setUrl(folderUrls[i]);
-            folderList.add(wdFolder);
-            this.mFolderList.put(folderName, wdFolder);
+        folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SPAM_FOLDER));
+        if (folderName != null)
+            mAccount.setSpamFolderName(folderName);
+
+        // K-9 Mail's outbox is a special local folder and different from Exchange/WebDAV's outbox.
+        /*
+        folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_OUTBOX_FOLDER));
+        if (folderName != null)
+            mAccount.setOutboxFolderName(folderName);
+        */
+
+        folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SENT_FOLDER));
+        if (folderName != null)
+            mAccount.setSentFolderName(folderName);
+
+        /**
+         * Next we get all the folders (including "special" ones)
+         */
+        headers = new HashMap<String, String>();
+        dataset = new DataSet();
+        headers.put("Brief", "t");
+        dataset = processRequest(this.mUrl, "SEARCH", getFolderListXml(), headers);
+        String[] folderUrls = dataset.getHrefs();
+
+        for (int i = 0; i < folderUrls.length; i++) {
+            String tempUrl = folderUrls[i];
+            WebDavFolder folder = createFolder(tempUrl);
+            if (folder != null)
+                folderList.add(folder);
         }
 
         return folderList;
     }
 
+    /**
+     * Creates a folder using the URL passed as parameter (only if it has not been
+     * already created) and adds this to our store folder map.
+     *
+     * @param folderUrl
+     * @return
+     */
+    private WebDavFolder createFolder(String folderUrl) {
+        if (folderUrl == null)
+            return null;
+
+        WebDavFolder wdFolder = null;
+        String folderName = getFolderName(folderUrl);
+        if (folderName != null) {
+            if (!this.mFolderList.containsKey(folderName)) {
+                wdFolder = new WebDavFolder(this, folderName);
+                wdFolder.setUrl(folderUrl);
+                mFolderList.put(folderName, wdFolder);
+            }
+        }
+        // else: Unknown URL format => NO Folder created
+
+        return wdFolder;
+    }
+
+    private String getFolderName(String folderUrl) {
+        if (folderUrl == null)
+            return null;
+
+        // Here we extract the folder name starting from the complete url.
+        // folderUrl is in the form http://mail.domain.com/exchange/username/foldername
+        // so we need "foldername" which is the string after the fifth slash
+        int folderSlash = -1;
+        for (int j = 0; j < 5; j++) {
+            folderSlash = folderUrl.indexOf('/', folderSlash + 1);
+            if (folderSlash < 0)
+                break;
+        }
+
+        if (folderSlash > 0) {
+            String folderName;
+            String fullPathName;
+
+            // Removes the final slash if present
+            if (folderUrl.charAt(folderUrl.length() - 1) == '/')
+                fullPathName = folderUrl.substring(folderSlash + 1, folderUrl.length() - 1);
+            else
+                fullPathName = folderUrl.substring(folderSlash + 1);
+
+            // Decodes the url-encoded folder name (i.e. "My%20folder" => "My Folder"
+            try {
+                folderName = java.net.URLDecoder.decode(fullPathName, "UTF-8");
+            } catch (UnsupportedEncodingException uee) {
+                /**
+                 * If we don't support UTF-8 there's a problem, don't decode
+                 * it then
+                 */
+                folderName = fullPathName;
+            }
+
+            return folderName;
+        }
+
+        return null;
+    }
+
     @Override
     public Folder getFolder(String name) {
         WebDavFolder folder;
@@ -472,7 +555,10 @@ public class WebDavStore extends Store {
     }
 
     public Folder getSendSpoolFolder() throws MessagingException {
-        return getFolder(DAV_MAIL_SEND_FOLDER);
+        if (mSendFolder == null)
+            mSendFolder = getFolder(DAV_MAIL_SEND_FOLDER);
+
+        return mSendFolder;
     }
 
     @Override
@@ -485,11 +571,31 @@ public class WebDavStore extends Store {
         return true;
     }
 
+    private String getSpecialFoldersList() {
+        StringBuilder buffer = new StringBuilder(200);
+        buffer.append("<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>");
+        buffer.append("<propfind xmlns=\"DAV:\">");
+        buffer.append("<prop>");
+        buffer.append("<").append(DAV_MAIL_INBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+        buffer.append("<").append(DAV_MAIL_DRAFTS_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+        buffer.append("<").append(DAV_MAIL_OUTBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+        buffer.append("<").append(DAV_MAIL_SENT_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+        buffer.append("<").append(DAV_MAIL_TRASH_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+        // This should always be ##DavMailSubmissionURI## for which we already have a constant
+        // buffer.append("<sendmsg xmlns=\"urn:schemas:httpmail:\"/>");
+
+        buffer.append("<").append(DAV_MAIL_SPAM_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>");
+
+        buffer.append("</prop>");
+        buffer.append("</propfind>");
+        return buffer.toString();
+    }
+
     /***************************************************************
      * WebDAV XML Request body retrieval functions
      */
     private String getFolderListXml() {
-        StringBuffer buffer = new StringBuffer(200);
+        StringBuilder buffer = new StringBuilder(200);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"DAV:uid\", \"DAV:ishidden\"\r\n");
@@ -500,7 +606,7 @@ public class WebDavStore extends Store {
     }
 
     private String getMessageCountXml(String messageState) {
-        StringBuffer buffer = new StringBuffer(200);
+        StringBuilder buffer = new StringBuilder(200);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"DAV:visiblecount\"\r\n");
@@ -513,7 +619,7 @@ public class WebDavStore extends Store {
     }
 
     private String getMessageEnvelopeXml(String[] uids) {
-        StringBuffer buffer = new StringBuffer(200);
+        StringBuilder buffer = new StringBuilder(200);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"DAV:uid\", \"DAV:getcontentlength\",");
@@ -543,7 +649,7 @@ public class WebDavStore extends Store {
     }
 
     private String getMessagesXml() {
-        StringBuffer buffer = new StringBuffer(200);
+        StringBuilder buffer = new StringBuilder(200);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"DAV:uid\"\r\n");
@@ -554,7 +660,7 @@ public class WebDavStore extends Store {
     }
 
     private String getMessageUrlsXml(String[] uids) {
-        StringBuffer buffer = new StringBuffer(600);
+        StringBuilder buffer = new StringBuilder(600);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"urn:schemas:httpmail:read\", \"DAV:uid\"\r\n");
@@ -578,7 +684,7 @@ public class WebDavStore extends Store {
             throw new MessagingException("Attempt to get flags on 0 length array for uids");
         }
 
-        StringBuffer buffer = new StringBuffer(200);
+        StringBuilder buffer = new StringBuilder(200);
         buffer.append("<?xml version='1.0' ?>");
         buffer.append("<a:searchrequest xmlns:a='DAV:'><a:sql>\r\n");
         buffer.append("SELECT \"urn:schemas:httpmail:read\", \"DAV:uid\"\r\n");
@@ -597,7 +703,7 @@ public class WebDavStore extends Store {
     }
 
     private String getMarkMessagesReadXml(String[] urls, boolean read) {
-        StringBuffer buffer = new StringBuffer(600);
+        StringBuilder buffer = new StringBuilder(600);
         buffer.append("<?xml version='1.0' ?>\r\n");
         buffer.append("<a:propertyupdate xmlns:a='DAV:' xmlns:b='urn:schemas:httpmail:'>\r\n");
         buffer.append("<a:target>\r\n");
@@ -621,7 +727,7 @@ public class WebDavStore extends Store {
     private String getMoveOrCopyMessagesReadXml(String[] urls, boolean isMove) {
 
         String action = (isMove ? "move" : "copy");
-        StringBuffer buffer = new StringBuffer(600);
+        StringBuilder buffer = new StringBuilder(600);
         buffer.append("<?xml version='1.0' ?>\r\n");
         buffer.append("<a:").append(action).append(" xmlns:a='DAV:' xmlns:b='urn:schemas:httpmail:'>\r\n");
         buffer.append("<a:target>\r\n");
@@ -1152,7 +1258,7 @@ public class WebDavStore extends Store {
 
     @Override
     public void sendMessages(Message[] messages) throws MessagingException {
-        WebDavFolder tmpFolder = (WebDavStore.WebDavFolder) getFolder(DAV_MAIL_TMP_FOLDER);
+        WebDavFolder tmpFolder = (WebDavStore.WebDavFolder) getFolder(mAccount.getDraftsFolderName());
         try {
             tmpFolder.open(OpenMode.READ_WRITE);
             Message[] retMessages = tmpFolder.appendWebDavMessages(messages);
@@ -1189,37 +1295,30 @@ public class WebDavStore extends Store {
             store = nStore;
             this.mName = name;
 
-            if (DAV_MAIL_SEND_FOLDER.equals(name)) {
-                this.mFolderUrl = getUrl() + "/" + name + "/";
-            } else {
-                String encodedName = "";
-                try {
-                    String[] urlParts = name.split("/");
-                    String url = "";
-                    for (int i = 0, count = urlParts.length; i < count; i++) {
-                        if (i != 0) {
-                            url = url + "/" + java.net.URLEncoder.encode(urlParts[i], "UTF-8");
-                        } else {
-                            url = java.net.URLEncoder.encode(urlParts[i], "UTF-8");
-                        }
+            String encodedName = "";
+            try {
+                String[] urlParts = name.split("/");
+                String url = "";
+                for (int i = 0, count = urlParts.length; i < count; i++) {
+                    if (i != 0) {
+                        url = url + "/" + java.net.URLEncoder.encode(urlParts[i], "UTF-8");
+                    } else {
+                        url = java.net.URLEncoder.encode(urlParts[i], "UTF-8");
                     }
-                    encodedName = url;
-                } catch (UnsupportedEncodingException uee) {
-                    Log.e(K9.LOG_TAG, "UnsupportedEncodingException URLEncoding folder name, skipping encoded");
-                    encodedName = name;
                 }
-
-                encodedName = encodedName.replaceAll("\\+", "%20");
-
-                if (encodedName.equals(K9.INBOX)) {
-                    encodedName = "Inbox";
-                }
-                this.mFolderUrl = WebDavStore.this.mUrl;
-                if (!WebDavStore.this.mUrl.endsWith("/")) {
-                    this.mFolderUrl += "/";
-                }
-                this.mFolderUrl += encodedName;
+                encodedName = url;
+            } catch (UnsupportedEncodingException uee) {
+                Log.e(K9.LOG_TAG, "UnsupportedEncodingException URLEncoding folder name, skipping encoded");
+                encodedName = name;
             }
+
+            encodedName = encodedName.replaceAll("\\+", "%20");
+
+            this.mFolderUrl = WebDavStore.this.mUrl;
+            if (!WebDavStore.this.mUrl.endsWith("/")) {
+                this.mFolderUrl += "/";
+            }
+            this.mFolderUrl += encodedName;
         }
 
         public void setUrl(String url) {
@@ -1300,6 +1399,9 @@ public class WebDavStore extends Store {
             if (dataset != null) {
                 messageCount = dataset.getMessageCount();
             }
+            if (K9.DEBUG && K9.DEBUG_PROTOCOL_WEBDAV) {
+                Log.v(K9.LOG_TAG, "Counted messages and webdav returned: "+messageCount);
+            }
 
             return messageCount;
         }
@@ -1486,7 +1588,11 @@ public class WebDavStore extends Store {
             }
 
             if (fp.contains(FetchProfile.Item.BODY_SANE)) {
-                fetchMessages(messages, listener, (mAccount.getMaximumAutoDownloadMessageSize() / 76));
+                if (mAccount.getMaximumAutoDownloadMessageSize() > 0) {
+                    fetchMessages(messages, listener, (mAccount.getMaximumAutoDownloadMessageSize() / 76));
+                } else {
+                    fetchMessages(messages, listener, -1);
+                }
             }
             if (fp.contains(FetchProfile.Item.BODY)) {
                 fetchMessages(messages, listener, -1);
@@ -1556,7 +1662,7 @@ public class WebDavStore extends Store {
 
                     if (entity != null) {
                         InputStream istream = null;
-                        StringBuffer buffer = new StringBuffer();
+                        StringBuilder buffer = new StringBuilder();
                         String tempText = "";
                         String resultText = "";
                         BufferedReader reader;
@@ -1655,13 +1761,17 @@ public class WebDavStore extends Store {
                 WebDavMessage wdMessage = (WebDavMessage) messages[i];
 
                 if (listener != null) {
-                    listener.messageStarted(messages[i].getUid(), i, count);
+                    listener.messageStarted(wdMessage.getUid(), i, count);
                 }
 
-                wdMessage.setFlagInternal(Flag.SEEN, uidToReadStatus.get(wdMessage.getUid()));
+                try {
+                    wdMessage.setFlagInternal(Flag.SEEN, uidToReadStatus.get(wdMessage.getUid()));
+                } catch (NullPointerException e) {
+                    Log.v(K9.LOG_TAG,"Under some weird circumstances, setting the read status when syncing from webdav threw an NPE. Skipping.");
+                }
 
                 if (listener != null) {
-                    listener.messageFinished(messages[i], i, count);
+                    listener.messageFinished(wdMessage, i, count);
                 }
             }
         }
@@ -1723,8 +1833,13 @@ public class WebDavStore extends Store {
                     listener.messageStarted(messages[i].getUid(), i, count);
                 }
 
-                wdMessage.setNewHeaders(envelopes.get(wdMessage.getUid()));
-                wdMessage.setFlagInternal(Flag.SEEN, envelopes.get(wdMessage.getUid()).getReadStatus());
+                ParsedMessageEnvelope envelope = envelopes.get(wdMessage.getUid());
+                if (envelope != null) {
+                    wdMessage.setNewHeaders(envelope);
+                    wdMessage.setFlagInternal(Flag.SEEN, envelope.getReadStatus());
+                } else {
+                    Log.e(K9.LOG_TAG,"Asked to get metadata for a non-existent message: "+wdMessage.getUid());
+                }
 
                 if (listener != null) {
                     listener.messageFinished(messages[i], i, count);
@@ -2119,12 +2234,12 @@ public class WebDavStore extends Store {
     public class DataSet {
         private HashMap<String, HashMap<String, String>> mData = new HashMap<String, HashMap<String, String>>();
         // private HashMap<String, String> mLostData = new HashMap<String, String>();
-        private String mUid = "";
+        private StringBuilder mUid = new StringBuilder();
         private HashMap<String, String> mTempData = new HashMap<String, String>();
 
         public void addValue(String value, String tagName) {
             if (tagName.equals("uid")) {
-                mUid = value;
+                mUid.append(value);
             }
 
             if (mTempData.containsKey(tagName)) {
@@ -2135,9 +2250,10 @@ public class WebDavStore extends Store {
         }
 
         public void finish() {
-            if (mUid != null &&
+            String uid = mUid.toString();
+            if (!uid.equals("") &&
                     mTempData != null) {
-                mData.put(mUid, mTempData);
+                mData.put(uid, mTempData);
             } else if (mTempData != null) {
                 /*
                  * Lost Data are for requests that don't include a message UID. These requests should only have a depth
@@ -2145,10 +2261,21 @@ public class WebDavStore extends Store {
                  */
             }
 
-            mUid = "";
+            mUid = new StringBuilder();
             mTempData = new HashMap<String, String>();
         }
 
+        /**
+         * Returns a hashmap of special folder name => special folder url
+         */
+        public HashMap<String, String> getSpecialFolderToUrl() {
+            // We return the first (and only) map
+            for (HashMap<String, String> folderMap : mData.values()) {
+                return folderMap;
+            }
+            return new HashMap<String, String>();
+        }
+
         /**
          * Returns a hashmap of Message UID => Message Url
          */
@@ -2176,10 +2303,14 @@ public class WebDavStore extends Store {
             for (String uid : mData.keySet()) {
                 HashMap<String, String> data = mData.get(uid);
                 String readStatus = data.get("read");
-                if (readStatus != null &&
-                        !readStatus.equals("")) {
+                if (readStatus != null && !readStatus.equals("")) {
                     Boolean value = !readStatus.equals("0");
                     uidToRead.put(uid, value);
+                } else {
+                    // We don't actually want to have null values in our hashmap,
+                    // as it causes the calling code to crash with an NPE as it
+                    // does a lookup in the map.
+                    uidToRead.put(uid, false);
                 }
             }
 
@@ -2218,7 +2349,12 @@ public class WebDavStore extends Store {
          * Returns the message count as it was retrieved
          */
         public int getMessageCount() {
-            int messageCount = -1;
+            // It appears that Exchange is returning responses
+            // without a visiblecount element for empty folders
+            // Which resulted in this code returning -1 (as that was
+            // the previous default.)
+            // -1 is an error condition. Now the default is empty
+            int messageCount = 0;
 
             for (String uid : mData.keySet()) {
                 HashMap<String, String> data = mData.get(uid);
@@ -2260,8 +2396,8 @@ public class WebDavStore extends Store {
                             String date = data.get(header);
                             date = date.substring(0, date.length() - 1);
 
-                            DateFormat dfInput = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-                            DateFormat dfOutput = new SimpleDateFormat("EEE, d MMM yy HH:mm:ss Z");
+                            DateFormat dfInput = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
+                            DateFormat dfOutput = new SimpleDateFormat("EEE, d MMM yy HH:mm:ss Z", Locale.US);
                             String tempDate = "";
 
                             try {
diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java
index e4e945e16..b8273a820 100644
--- a/src/com/fsck/k9/mail/transport/SmtpTransport.java
+++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java
@@ -13,6 +13,7 @@ import com.fsck.k9.mail.filter.PeekableInputStream;
 import com.fsck.k9.mail.filter.SmtpDataStuffing;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.store.TrustManagerFactory;
+import com.fsck.k9.mail.store.LocalStore.LocalMessage;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
@@ -24,10 +25,7 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.*;
 import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import org.apache.commons.codec.binary.Hex;
 
 import java.util.*;
 
@@ -40,6 +38,14 @@ public class SmtpTransport extends Transport {
     public static final int CONNECTION_SECURITY_SSL_REQUIRED = 3;
     public static final int CONNECTION_SECURITY_SSL_OPTIONAL = 4;
 
+    public static final String AUTH_PLAIN = "PLAIN";
+
+    public static final String AUTH_CRAM_MD5 = "CRAM_MD5";
+
+    public static final String AUTH_LOGIN = "LOGIN";
+
+    public static final String AUTH_AUTOMATIC = "AUTOMATIC";
+
 
     /**
      * Decodes a SmtpTransport URI.
@@ -184,7 +190,7 @@ public class SmtpTransport extends Transport {
     PeekableInputStream mIn;
     OutputStream mOut;
     private boolean m8bitEncodingAllowed;
-
+    private int mLargestAcceptableMessage;
 
     public SmtpTransport(String uri) throws MessagingException {
         ServerSettings settings;
@@ -261,7 +267,7 @@ public class SmtpTransport extends Transport {
             executeSimpleCommand(null);
 
             InetAddress localAddress = mSocket.getLocalAddress();
-            String localHost = localAddress.getHostName();
+            String localHost = localAddress.getCanonicalHostName();
             String ipAddr = localAddress.getHostAddress();
 
             if (localHost.equals("") || localHost.equals(ipAddr) || localHost.contains("_")) {
@@ -283,6 +289,8 @@ public class SmtpTransport extends Transport {
 
             m8bitEncodingAllowed = results.contains("8BITMIME");
 
+
+
             /*
              * TODO may need to add code to fall back to HELO I switched it from
              * using HELO on non STARTTLS connections because of AOL's mail
@@ -317,9 +325,13 @@ public class SmtpTransport extends Transport {
                 }
             }
 
-            /*
-             * result contains the results of the EHLO in concatenated form
-             */
+            boolean useAuthLogin = AUTH_LOGIN.equals(mAuthType);
+            boolean useAuthPlain = AUTH_PLAIN.equals(mAuthType);
+            boolean useAuthCramMD5 = AUTH_CRAM_MD5.equals(mAuthType);
+
+            // Automatically choose best authentication method if none was explicitly selected
+            boolean useAutomaticAuth = !(useAuthLogin || useAuthPlain || useAuthCramMD5);
+
             boolean authLoginSupported = false;
             boolean authPlainSupported = false;
             boolean authCramMD5Supported = false;
@@ -330,18 +342,54 @@ public class SmtpTransport extends Transport {
                 if (result.matches(".*AUTH.*PLAIN.*$")) {
                     authPlainSupported = true;
                 }
-                if (result.matches(".*AUTH.*CRAM-MD5.*$") && mAuthType != null && mAuthType.equals("CRAM_MD5")) {
+                if (result.matches(".*AUTH.*CRAM-MD5.*$")) {
                     authCramMD5Supported = true;
                 }
+                if (result.matches(".*SIZE \\d*$")) {
+                    try {
+                        mLargestAcceptableMessage = Integer.parseInt(result.substring(result.lastIndexOf(' ') + 1));
+                    } catch (Exception e) {
+                        if (K9.DEBUG && K9.DEBUG_PROTOCOL_SMTP) {
+                            Log.d(K9.LOG_TAG, "Tried to parse " + result + " and get an int out of the last word: " + e);
+                        }
+                    }
+                }
             }
 
-            if (mUsername != null && mUsername.length() > 0 && mPassword != null
-                    && mPassword.length() > 0) {
-                if (authCramMD5Supported) {
+            if (mUsername != null && mUsername.length() > 0 &&
+                    mPassword != null && mPassword.length() > 0) {
+                if (useAuthCramMD5 || (useAutomaticAuth && authCramMD5Supported)) {
+                    if (!authCramMD5Supported && K9.DEBUG && K9.DEBUG_PROTOCOL_SMTP) {
+                        Log.d(K9.LOG_TAG, "Using CRAM_MD5 as authentication method although the " +
+                              "server didn't advertise support for it in EHLO response.");
+                    }
                     saslAuthCramMD5(mUsername, mPassword);
-                } else if (authPlainSupported) {
-                    saslAuthPlain(mUsername, mPassword);
-                } else if (authLoginSupported) {
+                } else if (useAuthPlain || (useAutomaticAuth && authPlainSupported)) {
+                    if (!authPlainSupported && K9.DEBUG && K9.DEBUG_PROTOCOL_SMTP) {
+                        Log.d(K9.LOG_TAG, "Using PLAIN as authentication method although the " +
+                              "server didn't advertise support for it in EHLO response.");
+                    }
+                    try {
+                        saslAuthPlain(mUsername, mPassword);
+                    } catch (MessagingException ex) {
+                        // PLAIN is a special case.  Historically, PLAIN has represented both PLAIN and LOGIN; only the
+                        // protocol being advertised by the server would be used, with PLAIN taking precedence.  Instead
+                        // of using only the requested protocol, we'll try PLAIN and then try LOGIN.
+                        if (useAuthPlain && authLoginSupported) {
+                            if (K9.DEBUG && K9.DEBUG_PROTOCOL_SMTP) {
+                                Log.d(K9.LOG_TAG, "Using legacy PLAIN authentication behavior and trying LOGIN.");
+                            }
+                            saslAuthLogin(mUsername, mPassword);
+                        } else {
+                            // If it was auto detected and failed, continue throwing the exception back up.
+                            throw ex;
+                        }
+                    }
+                } else if (useAuthLogin || (useAutomaticAuth && authLoginSupported)) {
+                    if (!authPlainSupported && K9.DEBUG && K9.DEBUG_PROTOCOL_SMTP) {
+                        Log.d(K9.LOG_TAG, "Using LOGIN as authentication method although the " +
+                              "server didn't advertise support for it in EHLO response.");
+                    }
                     saslAuthLogin(mUsername, mPassword);
                 } else {
                     throw new MessagingException("No valid authentication mechanism found.");
@@ -391,18 +439,28 @@ public class SmtpTransport extends Transport {
 
     private void sendMessageTo(ArrayList<String> addresses, Message message)
     throws MessagingException {
+        boolean possibleSend = false;
+
         close();
         open();
 
         message.setEncoding(m8bitEncodingAllowed ? "8bit" : null);
+        // If the message has attachments and our server has told us about a limit on
+        // the size of messages, count the message's size before sending it
+        if (mLargestAcceptableMessage > 0 && ((LocalMessage)message).hasAttachments()) {
+            if (message.calculateSize() > mLargestAcceptableMessage) {
+                MessagingException me = new MessagingException("Message too large for server");
+                me.setPermanentFailure(possibleSend);
+                throw me;
+            }
+        }
 
         Address[] from = message.getFrom();
-        boolean possibleSend = false;
         try {
             //TODO: Add BODY=8BITMIME parameter if appropriate?
-            executeSimpleCommand("MAIL FROM: " + "<" + from[0].getAddress() + ">");
+            executeSimpleCommand("MAIL FROM:" + "<" + from[0].getAddress() + ">");
             for (String address : addresses) {
-                executeSimpleCommand("RCPT TO: " + "<" + address + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address + ">");
             }
             executeSimpleCommand("DATA");
 
@@ -421,6 +479,14 @@ public class SmtpTransport extends Transport {
             executeSimpleCommand("\r\n.");
         } catch (Exception e) {
             MessagingException me = new MessagingException("Unable to send message", e);
+
+            // "5xx text" -responses are permanent failures
+            String msg = e.getMessage();
+            if (msg != null && msg.startsWith("5")) {
+                Log.w(K9.LOG_TAG, "handling 5xx SMTP error code as a permanent failure");
+                possibleSend = false;
+            }
+
             me.setPermanentFailure(possibleSend);
             throw me;
         } finally {
@@ -459,7 +525,7 @@ public class SmtpTransport extends Transport {
     }
 
     private String readLine() throws IOException {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int d;
         while ((d = mIn.read()) != -1) {
             if (((char)d) == '\r') {
@@ -596,33 +662,15 @@ public class SmtpTransport extends Transport {
 
     private void saslAuthCramMD5(String username, String password) throws MessagingException,
         AuthenticationFailedException, IOException {
+
         List<String> respList = executeSimpleCommand("AUTH CRAM-MD5");
-        if (respList.size() != 1) throw new AuthenticationFailedException("Unable to negotiate CRAM-MD5");
+        if (respList.size() != 1) {
+            throw new AuthenticationFailedException("Unable to negotiate CRAM-MD5");
+        }
+
         String b64Nonce = respList.get(0);
-        byte[] nonce = Base64.decodeBase64(b64Nonce.getBytes("US-ASCII"));
-        byte[] ipad = new byte[64];
-        byte[] opad = new byte[64];
-        byte[] secretBytes = password.getBytes("US-ASCII");
-        MessageDigest md;
-        try {
-            md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException nsae) {
-            throw new AuthenticationFailedException("MD5 Not Available.");
-        }
-        if (secretBytes.length > 64) {
-            secretBytes = md.digest(secretBytes);
-        }
-        System.arraycopy(secretBytes, 0, ipad, 0, secretBytes.length);
-        System.arraycopy(secretBytes, 0, opad, 0, secretBytes.length);
-        for (int i = 0; i < ipad.length; i++) ipad[i] ^= 0x36;
-        for (int i = 0; i < opad.length; i++) opad[i] ^= 0x5c;
-        md.update(ipad);
-        byte[] firstPass = md.digest(nonce);
-        md.update(opad);
-        byte[] result = md.digest(firstPass);
-        String plainCRAM = username + " " + new String(Hex.encodeHex(result));
-        byte[] b64CRAM = Base64.encodeBase64(plainCRAM.getBytes("US-ASCII"));
-        String b64CRAMString = new String(b64CRAM, "US-ASCII");
+        String b64CRAMString = Authentication.computeCramMd5(mUsername, mPassword, b64Nonce);
+
         try {
             executeSimpleCommand(b64CRAMString, true);
         } catch (MessagingException me) {
diff --git a/src/com/fsck/k9/preferences/TimePickerPreference.java b/src/com/fsck/k9/preferences/TimePickerPreference.java
index d706e76e7..a2d6592b3 100644
--- a/src/com/fsck/k9/preferences/TimePickerPreference.java
+++ b/src/com/fsck/k9/preferences/TimePickerPreference.java
@@ -6,6 +6,7 @@ package com.fsck.k9.preferences;
 
 import android.content.Context;
 import android.preference.DialogPreference;
+import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TimePicker;
@@ -25,12 +26,23 @@ public class TimePickerPreference extends DialogPreference implements
      * The default value for this preference
      */
     private String defaultValue;
-
+    /**
+     * Store the original value, in case the user
+     * chooses to abort the {@link DialogPreference}
+     * after making a change.
+     */
+    private int originalHour = 0;
+    /**
+     * Store the original value, in case the user
+     * chooses to abort the {@link DialogPreference}
+     * after making a change.
+     */
+    private int originalMinute = 0;
     /**
      * @param context
      * @param attrs
      */
-    public TimePickerPreference(Context context, AttributeSet attrs) {
+    public TimePickerPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         initialize();
     }
@@ -40,8 +52,8 @@ public class TimePickerPreference extends DialogPreference implements
      * @param attrs
      * @param defStyle
      */
-    public TimePickerPreference(Context context, AttributeSet attrs,
-                                int defStyle) {
+    public TimePickerPreference(final Context context, final AttributeSet attrs,
+                                final int defStyle) {
         super(context, attrs, defStyle);
         initialize();
     }
@@ -62,39 +74,49 @@ public class TimePickerPreference extends DialogPreference implements
     protected View onCreateDialogView() {
 
         TimePicker tp = new TimePicker(getContext());
+        tp.setIs24HourView(DateFormat.is24HourFormat(getContext()));
         tp.setOnTimeChangedListener(this);
-
-        int h = getHour();
-        int m = getMinute();
-        if (h >= 0 && m >= 0) {
-            tp.setCurrentHour(h);
-            tp.setCurrentMinute(m);
+        originalHour = getHour();
+        originalMinute = getMinute();
+        if (originalHour >= 0 && originalMinute >= 0) {
+            tp.setCurrentHour(originalHour);
+            tp.setCurrentMinute(originalMinute);
         }
 
         return tp;
     }
 
-    /*
-     * (non-Javadoc)
-     *
+    /**
      * @see
      * android.widget.TimePicker.OnTimeChangedListener#onTimeChanged(android
      * .widget.TimePicker, int, int)
      */
     @Override
-    public void onTimeChanged(TimePicker view, int hour, int minute) {
+    public void onTimeChanged(final TimePicker view, final int hour, final int minute) {
 
         persistString(String.format("%02d:%02d", hour, minute));
         callChangeListener(String.format("%02d:%02d", hour, minute));
     }
 
-    /*
-     * (non-Javadoc)
-     *
+    /**
+     * If not a positive result, restore the original value
+     * before going to super.onDialogClosed(positiveResult).
+     */
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+
+        if (!positiveResult) {
+            persistString(String.format("%02d:%02d", originalHour, originalMinute));
+            callChangeListener(String.format("%02d:%02d", originalHour, originalMinute));
+        }
+        super.onDialogClosed(positiveResult);
+    }
+
+    /**
      * @see android.preference.Preference#setDefaultValue(java.lang.Object)
      */
     @Override
-    public void setDefaultValue(Object defaultValue) {
+    public void setDefaultValue(final Object defaultValue) {
         // BUG this method is never called if you use the 'android:defaultValue' attribute in your XML preference file, not sure why it isn't
 
         super.setDefaultValue(defaultValue);
@@ -113,10 +135,10 @@ public class TimePickerPreference extends DialogPreference implements
     /**
      * Get the hour value (in 24 hour time)
      *
-     * @return The hour value, will be 0 to 23 (inclusive)
+     * @return The hour value, will be 0 to 23 (inclusive) or -1 if illegal
      */
     private int getHour() {
-        String time = getPersistedString(this.defaultValue);
+        String time = getTime();
         if (time == null || !time.matches(VALIDATION_EXPRESSION)) {
             return -1;
         }
@@ -127,10 +149,10 @@ public class TimePickerPreference extends DialogPreference implements
     /**
      * Get the minute value
      *
-     * @return the minute value, will be 0 to 59 (inclusive)
+     * @return the minute value, will be 0 to 59 (inclusive) or -1 if illegal
      */
     private int getMinute() {
-        String time = getPersistedString(this.defaultValue);
+        String time = getTime();
         if (time == null || !time.matches(VALIDATION_EXPRESSION)) {
             return -1;
         }
@@ -138,6 +160,12 @@ public class TimePickerPreference extends DialogPreference implements
         return Integer.valueOf(time.split(":")[1]);
     }
 
+    /**
+     * Get the time. It is only legal, if it matches
+     * {@link #VALIDATION_EXPRESSION}.
+     *
+     * @return the time as hh:mm
+     */
     public String getTime() {
         return getPersistedString(this.defaultValue);
     }
diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/src/com/fsck/k9/provider/AttachmentProvider.java
index fc9c8c4f6..3b5360a21 100644
--- a/src/com/fsck/k9/provider/AttachmentProvider.java
+++ b/src/com/fsck/k9/provider/AttachmentProvider.java
@@ -30,6 +30,7 @@ public class AttachmentProvider extends ContentProvider {
     public static final Uri CONTENT_URI = Uri.parse("content://com.fsck.k9.attachmentprovider");
 
     private static final String FORMAT_RAW = "RAW";
+    private static final String FORMAT_VIEW = "VIEW";
     private static final String FORMAT_THUMBNAIL = "THUMBNAIL";
 
     public static class AttachmentProviderColumns {
@@ -40,7 +41,11 @@ public class AttachmentProvider extends ContentProvider {
     }
 
     public static Uri getAttachmentUri(Account account, long id) {
-        return getAttachmentUri(account.getUuid(), id);
+        return getAttachmentUri(account.getUuid(), id, true);
+    }
+
+    public static Uri getAttachmentUriForViewing(Account account, long id) {
+        return getAttachmentUri(account.getUuid(), id, false);
     }
 
     public static Uri getAttachmentThumbnailUri(Account account, long id, int width, int height) {
@@ -53,11 +58,11 @@ public class AttachmentProvider extends ContentProvider {
                .build();
     }
 
-    private static Uri getAttachmentUri(String db, long id) {
+    private static Uri getAttachmentUri(String db, long id, boolean raw) {
         return CONTENT_URI.buildUpon()
                .appendPath(db)
                .appendPath(Long.toString(id))
-               .appendPath(FORMAT_RAW)
+               .appendPath(raw ? FORMAT_RAW : FORMAT_VIEW)
                .build();
     }
 
@@ -67,7 +72,14 @@ public class AttachmentProvider extends ContentProvider {
          * We use the cache dir as a temporary directory (since Android doesn't give us one) so
          * on startup we'll clean up any .tmp files from the last run.
          */
-        File[] files = getContext().getCacheDir().listFiles();
+        final File cacheDir = getContext().getCacheDir();
+        if (cacheDir == null) {
+            return true;
+        }
+        File[] files = cacheDir.listFiles();
+        if (files == null) {
+            return true;
+        }
         for (File file : files) {
             if (file.getName().endsWith(".tmp")) {
                 file.delete();
@@ -98,6 +110,11 @@ public class AttachmentProvider extends ContentProvider {
         String dbName = segments.get(0);
         String id = segments.get(1);
         String format = segments.get(2);
+
+        return getType(dbName, id, format);
+    }
+
+    private String getType(String dbName, String id, String format) {
         if (FORMAT_THUMBNAIL.equals(format)) {
             return "image/png";
         } else {
@@ -105,7 +122,14 @@ public class AttachmentProvider extends ContentProvider {
 
             try {
                 final LocalStore localStore = LocalStore.getLocalInstance(account, K9.app);
-                return localStore.getAttachmentType(id);
+
+                AttachmentInfo attachmentInfo = localStore.getAttachmentInfo(id);
+                if (FORMAT_VIEW.equals(format)) {
+                    return MimeUtility.getMimeTypeForViewing(attachmentInfo.type, attachmentInfo.name);
+                } else {
+                    // When accessing the "raw" message we deliver the original MIME type.
+                    return attachmentInfo.type;
+                }
             } catch (MessagingException e) {
                 Log.e(K9.LOG_TAG, "Unable to retrieve LocalStore for " + account, e);
                 return null;
@@ -148,8 +172,7 @@ public class AttachmentProvider extends ContentProvider {
             File dir = getContext().getCacheDir();
             File file = new File(dir, filename);
             if (!file.exists()) {
-                Uri attachmentUri = getAttachmentUri(dbName, Long.parseLong(id));
-                String type = getType(attachmentUri);
+                String type = getType(dbName, id, FORMAT_VIEW);
                 try {
                     FileInputStream in = new FileInputStream(getFile(dbName, id));
                     try {
@@ -212,7 +235,7 @@ public class AttachmentProvider extends ContentProvider {
             final Account account = Preferences.getPreferences(getContext()).getAccount(dbName);
             attachmentInfo = LocalStore.getLocalInstance(account, K9.app).getAttachmentInfo(id);
         } catch (MessagingException e) {
-            Log.e(K9.LOG_TAG, "Uname to retrieve attachment info from local store for ID: " + id, e);
+            Log.e(K9.LOG_TAG, "Unable to retrieve attachment info from local store for ID: " + id, e);
             return null;
         }
 
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index f2615023e..f2c1ec693 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -60,6 +60,11 @@ public class MessageProvider extends ContentProvider {
          * <P>Type: TEXT</P>
          */
         String SENDER = "sender";
+        
+        /**
+         * <P>Type: TEXT</P>
+         */
+        String SENDER_ADDRESS = "senderAddress";
 
         /**
          * <P>Type: TEXT</P>
@@ -71,6 +76,11 @@ public class MessageProvider extends ContentProvider {
          */
         String PREVIEW = "preview";
 
+        /**
+         * <P>Type: BOOLEAN</P>
+         */
+        String UNREAD = "unread";
+
         String ACCOUNT = "account";
         String URI = "uri";
         String DELETE_URI = "delUri";
@@ -174,6 +184,12 @@ public class MessageProvider extends ContentProvider {
             return source.sender;
         }
     }
+    public static class SenderAddressExtractor implements FieldExtractor<MessageInfoHolder, String> {
+        @Override
+        public String getField(final MessageInfoHolder source) {
+            return source.senderAddress;
+        }
+    }
     public static class AccountExtractor implements FieldExtractor<MessageInfoHolder, String> {
         @Override
         public String getField(final MessageInfoHolder source) {
@@ -181,6 +197,13 @@ public class MessageProvider extends ContentProvider {
         }
     }
 
+    public static class UnreadExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
+        @Override
+        public Boolean getField(final MessageInfoHolder source) {
+            return Boolean.valueOf(!source.read); // avoid autoboxing
+        }
+    }
+
     /**
      * @deprecated having an incremential value has no real interest,
      *             implemented for compatibility only
@@ -278,6 +301,8 @@ public class MessageProvider extends ContentProvider {
                     extractors.put(field, new SubjectExtractor());
                 } else if (MessageColumns.SENDER.equals(field)) {
                     extractors.put(field, new SenderExtractor());
+                } else if (MessageColumns.SENDER_ADDRESS.equals(field)) {
+                    extractors.put(field, new SenderAddressExtractor());
                 } else if (MessageColumns.SEND_DATE.equals(field)) {
                     extractors.put(field, new SendDateExtractor());
                 } else if (MessageColumns.PREVIEW.equals(field)) {
@@ -288,6 +313,8 @@ public class MessageProvider extends ContentProvider {
                     extractors.put(field, new DeleteUriExtractor());
                 } else if (MessageColumns.ACCOUNT.equals(field)) {
                     extractors.put(field, new AccountExtractor());
+                } else if (MessageColumns.UNREAD.equals(field)) {
+                    extractors.put(field, new UnreadExtractor());
                 } else if (MessageColumns.INCREMENT.equals(field)) {
                     extractors.put(field, new IncrementExtractor());
                 }
@@ -804,7 +831,8 @@ public class MessageProvider extends ContentProvider {
         MessageColumns.PREVIEW,
         MessageColumns.ACCOUNT,
         MessageColumns.URI,
-        MessageColumns.DELETE_URI
+        MessageColumns.DELETE_URI,
+        MessageColumns.SENDER_ADDRESS
     };
 
     /**
@@ -865,7 +893,7 @@ public class MessageProvider extends ContentProvider {
             Log.v(K9.LOG_TAG, "MessageProvider/delete: " + uri);
         }
 
-        // Nota : can only delete a message
+        // Note: can only delete a message
 
         List<String> segments = null;
         int accountId = -1;
diff --git a/src/com/fsck/k9/service/CoreService.java b/src/com/fsck/k9/service/CoreService.java
index 8e70e8ed1..090e9b578 100644
--- a/src/com/fsck/k9/service/CoreService.java
+++ b/src/com/fsck/k9/service/CoreService.java
@@ -17,15 +17,65 @@ import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.helper.power.TracingPowerManager;
 import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
 
+/**
+ * Note: All documentation in this file market <CK:RE> is documentation written by Christian Knecht by reverse engineering.
+ *       This documentation is without warranty and may not be accurate nor reflect the author's original intent.
+ *      
+ * <CK:RE>
+ * CoreService is the base class for all K9 Services.
+ * 
+ * An Android service is a way to model a part of an application that needs to accomplish certain tasks without the
+ * UI part of the application being necessarily active (of course an application could also be a pure service, without
+ * any UI; this is not the case of K9). By declaring a service and starting it, the OS knows that the application has
+ * work to do and should avoid killing the process.
+ * 
+ * A service's main purpose is to do some task (usually in the background) which requires one of more threads. The
+ * thread that starts the service is the same as the UI thread of the process. It should thus not be used to run
+ * the tasks.
+ * 
+ * CoreService is providing the execution plumbing for background tasks including the required thread and task queuing
+ * for all K9 services to use.
+ * 
+ * A service is supposed to run only as long as it has some work to do whether that work is active processing or some
+ * just some monitoring, like listening on a network port for incoming connections or listing on an open network
+ * connection for incoming data (push mechanism).
+ * 
+ * To make sure the service is running only when required, is must be shutdown after tasks are done. As the
+ * execution of tasks is abstracted away in this class, it also proper shutdown handling if approriate. If
+ * the Service requires this is should call enableAutoShutdown(true) in it's onCreate() method. 
+ *
+ * While a service is running it's tasks, it is usually not a good idea to let the device go to sleep more.
+ * WakeLocks are used to avoid this. CoreService provides a central registry (singleton) that can be used
+ * application-wide to store WakeLocks.
+ * 
+ * In short, CoreService provides the following features to K9 Services:
+ *  - task execution and queuing
+ *  - Service life cycle management (insures the service is stopped when not needed anymore); disabled by default
+ *  - WakeLock registry and management
+ *  
+ * </CK:RE>      
+ */
 public abstract class CoreService extends Service {
 
-    public static String WAKE_LOCK_ID = "com.fsck.k9.service.CoreService.wakeLockId";
-    private static ConcurrentHashMap<Integer, TracingWakeLock> wakeLocks = new ConcurrentHashMap<Integer, TracingWakeLock>();
-    private static AtomicInteger wakeLockSeq = new AtomicInteger(0);
-    private ExecutorService threadPool = null;
+    public static String WAKE_LOCK_ID = "com.fsck.k9.service.CoreService.wakeLockId"; // CK:Intent attribute ID
+    private static ConcurrentHashMap<Integer, TracingWakeLock> wakeLocks = new ConcurrentHashMap<Integer, TracingWakeLock>(); // CK:WakeLocks registry
+    private static AtomicInteger wakeLockSeq = new AtomicInteger(0); // CK:WakeLock registry
+    private ExecutorService threadPool = null; // CK:Threadpool with a single thread; used to execute and queue background actions inside the service
     private final String className = getClass().getName();
-    private volatile boolean mShutdown = false;
+    private volatile boolean mShutdown = false; // CK:A:Seems to be used only when the service is "officially" shutdown to make sure that an exception raise because of the shutdown gets ignored.
 
+    /**
+     * Controls the auto-shutdown mechanism of the service. The default service life-cycle model is that the service should run
+     * only as long as a task is running. If a service should behave differently, disable auto-shutdown.
+     */
+    private boolean mAutoShutdown = true;
+    
+    /**
+     * This variable is part of the auto-shutdown feature and determines whether the service has to be shutdown at the
+     * end of the onStart() method or not.
+     */
+    protected boolean mImmediateShutdown = true; // 
+    
     @Override
     public void onCreate() {
         if (K9.DEBUG)
@@ -35,32 +85,66 @@ public abstract class CoreService extends Service {
 
     }
 
-    protected static void addWakeLockId(Intent i, Integer wakeLockId) {
+    /**
+     * Adds an existing WakeLock identified by it's WakeLock-ID to the specified Intent.
+     * @param i
+     * @param wakeLockId
+     */
+    protected static void addWakeLockId(Context context, Intent i, Integer wakeLockId, boolean createIfNotExists) {
         if (wakeLockId != null) {
             i.putExtra(BootReceiver.WAKE_LOCK_ID, wakeLockId);
+            return;
         }
+        if (createIfNotExists)
+          addWakeLock(context,i);
     }
 
+    /**
+     * Adds a new WakeLock to the intent.
+     * This will add the WakeLock to the central WakeLock registry managed by this class.
+     * @param context Required to be able to create a new wake-lock.
+     * @param i Intent to which to add the WakeLock (CK:Q:still unclear why we need to link Intents and WakeLocks)
+     */
     protected static void addWakeLock(Context context, Intent i) {
-        TracingPowerManager pm = TracingPowerManager.getPowerManager(context);
-        TracingWakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CoreService addWakeLock");
-        wakeLock.setReferenceCounted(false);
-        wakeLock.acquire(K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
-
-        Integer tmpWakeLockId = wakeLockSeq.getAndIncrement();
-        wakeLocks.put(tmpWakeLockId, wakeLock);
-
+        TracingWakeLock wakeLock = acquireWakeLock(context,"CoreService addWakeLock",K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT); // CK:Q: What this timeout? 30secs seems a bizarre choice. It it's a safeguard it should be longer, if it's to cover the real time required by some operation, it seems too short (though I say this before knowing really what the service is supposed to do)
+        Integer tmpWakeLockId = registerWakeLock(wakeLock);
         i.putExtra(WAKE_LOCK_ID, tmpWakeLockId);
     }
 
+    /**
+     * Register WakeLock and returns its registry-entry-ID
+     * @param wakeLock
+     * @return
+     * AUTHOR chrisk
+     */
+    protected static Integer registerWakeLock(TracingWakeLock wakeLock) {
+        Integer tmpWakeLockId = wakeLockSeq.getAndIncrement();
+        wakeLocks.put(tmpWakeLockId, wakeLock);
+        return tmpWakeLockId;
+    }
 
+    /**
+     * Acquires a WakeLock in a K9 standard way
+     * @param context
+     * @return
+     * AUTHOR chrisk
+     */
+    protected static TracingWakeLock acquireWakeLock(Context context, String tag, long timeout) {
+        TracingPowerManager pm = TracingPowerManager.getPowerManager(context);
+        TracingWakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, tag);
+        wakeLock.setReferenceCounted(false);
+        wakeLock.acquire(timeout);
+        return wakeLock;
+    }
 
     @Override
     public void onStart(Intent intent, int startId) {
-        TracingPowerManager pm = TracingPowerManager.getPowerManager(this);
-        TracingWakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CoreService onStart");
-        wakeLock.setReferenceCounted(false);
-        wakeLock.acquire(K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
+        // deprecated method but still used for backwards compatibility with Android version <2.0
+      
+        // CK:DocAdded: Manage wake-locks, especially, release any wake-locks held so far and define a new "local" wake lock.
+        //           Also, because we create a new wakelock, we re-initialize the wakelock timeout and give
+        //           the service-start code a protection of up to MAIL_SERVICE_WAKE_LOCK_TIMEOUT (currently 30s).
+        TracingWakeLock wakeLock = acquireWakeLock(this,"CoreService onStart",K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
 
         if (K9.DEBUG)
             Log.i(K9.LOG_TAG, "CoreService: " + className + ".onStart(" + intent + ", " + startId);
@@ -81,20 +165,30 @@ public abstract class CoreService extends Service {
             }
         }
 
+        // Run the actual start-code of the service
+        mImmediateShutdown = true;
         try {
             super.onStart(intent, startId);
             startService(intent, startId);
         } finally {
-            wakeLock.release();
+            try{wakeLock.release();} catch (Exception e) {/* ignore */}
+            try{if (mAutoShutdown && mImmediateShutdown && startId != -1) stopSelf(startId);} catch (Exception e) {/* ignore */} 
         }
     }
 
-    public void execute(Context context, final Runnable runner, int wakeLockTime, final Integer startId) {
+    /**
+     * 
+     * @param context
+     * @param runner
+     * @param wakeLockTime
+     * @param startId
+     * @return returns whether service-shutdown will actually happen after the task has been executed (or has already been done).
+     */
+    public boolean execute(Context context, final Runnable runner, int wakeLockTime, final Integer startId) {
 
-        TracingPowerManager pm = TracingPowerManager.getPowerManager(context);
-        final TracingWakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "CoreService execute");
-        wakeLock.setReferenceCounted(false);
-        wakeLock.acquire(wakeLockTime);
+        boolean serviceShutdownScheduled = false;
+        final TracingWakeLock wakeLock = acquireWakeLock(context,"CoreService execute",wakeLockTime);
+        final boolean autoShutdown = mAutoShutdown;
 
         Runnable myRunner = new Runnable() {
             public void run() {
@@ -107,11 +201,14 @@ public abstract class CoreService extends Service {
                         MessagingController.getInstance(getApplication()).systemStatusChanged();
                     }
                 } finally {
-                    if (K9.DEBUG)
-                        Log.d(K9.LOG_TAG, "CoreService (" + className + ") completed Runnable " + runner.hashCode() + " with startId " + startId);
-                    wakeLock.release();
-                    if (startId != null) {
-                        stopSelf(startId);
+                    try { // Making absolutely sure the service stopping command will be executed
+                        if (K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "CoreService (" + className + ") completed Runnable " + runner.hashCode() + " with startId " + startId);
+                        wakeLock.release();
+                    } finally {
+                        if (autoShutdown && startId != null) {
+                            stopSelf(startId); // <-- this is what is meant with "serviceShutdownScheduled"; execution of this line assures proper shutdown of the service once finished
+                        }
                     }
                 }
             }
@@ -121,12 +218,14 @@ public abstract class CoreService extends Service {
             Log.e(K9.LOG_TAG, "CoreService.execute (" + className + ") called with no threadPool available; running Runnable " + runner.hashCode() + " in calling thread", new Throwable());
             synchronized (this) {
                 myRunner.run();
+                serviceShutdownScheduled = startId != null; // In this case it's not actually scheduled, it's already done, but that should never happen anyway
             }
         } else {
             if (K9.DEBUG)
                 Log.d(K9.LOG_TAG, "CoreService (" + className + ") queueing Runnable " + runner.hashCode() + " with startId " + startId);
             try {
                 threadPool.execute(myRunner);
+                serviceShutdownScheduled = startId != null;
             } catch (RejectedExecutionException e) {
                 if (!mShutdown) {
                     throw e;
@@ -134,12 +233,23 @@ public abstract class CoreService extends Service {
                 Log.i(K9.LOG_TAG, "CoreService: " + className + " is shutting down, ignoring rejected execution exception: " + e.getMessage());
             }
         }
+        mImmediateShutdown = !serviceShutdownScheduled; 
+        return serviceShutdownScheduled;
     }
 
+    /**
+     * CK:Added
+     * To implement by sub-class instead of overriding onStart.
+     * This allows CoreService to do start and end operations around the sub-class's start code.
+     * Especially, CoreService will protect the start-code with a wake-lock to guarantee the service to have the required resources to do it's work.
+     * CK:Q: Is this really useful (the wakelock part)? The real work is happening in the worker-thread anyway. Maybe it is because this makes sure that whatever needs to be started by the service, it can be without being interrupted by the phone going to sleep.
+     * @param intent
+     * @param startId
+     */
     public abstract void startService(Intent intent, int startId);
 
     @Override
-    public IBinder onBind(Intent arg0) {
+    public IBinder onBind(@SuppressWarnings("unused") Intent intent) {
         // TODO Auto-generated method stub
         return null;
     }
@@ -158,4 +268,20 @@ public abstract class CoreService extends Service {
         super.onDestroy();
         //     MessagingController.getInstance(getApplication()).removeListener(mListener);
     }
+
+    /**
+     * @return True if auto-shutdown is enabled
+     */
+    protected boolean isAutoShutdown() {
+        return mAutoShutdown;
+    }
+
+    /**
+     * Enable of disable auto-shutdown (enabled by default).
+     * See {@#mAutoShutdown} for more information.
+     * @param autoShutdown
+     */
+    protected void setAutoShutdown(boolean autoShutdown) {
+        mAutoShutdown = autoShutdown;
+    }
 }
diff --git a/src/com/fsck/k9/service/MailService.java b/src/com/fsck/k9/service/MailService.java
index 06f2f193c..e8e3fc1a2 100644
--- a/src/com/fsck/k9/service/MailService.java
+++ b/src/com/fsck/k9/service/MailService.java
@@ -21,8 +21,6 @@ import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.helper.AutoSyncHelper;
 import com.fsck.k9.mail.Pusher;
 
-/**
- */
 public class MailService extends CoreService {
     private static final String ACTION_CHECK_MAIL = "com.fsck.k9.intent.action.MAIL_SERVICE_WAKEUP";
     private static final String ACTION_RESET = "com.fsck.k9.intent.action.MAIL_SERVICE_RESET";
@@ -42,10 +40,7 @@ public class MailService extends CoreService {
         Intent i = new Intent();
         i.setClass(context, MailService.class);
         i.setAction(MailService.ACTION_RESET);
-        addWakeLockId(i, wakeLockId);
-        if (wakeLockId == null) {
-            addWakeLock(context, i);
-        }
+        addWakeLockId(context, i, wakeLockId, true);
         context.startService(i);
     }
 
@@ -53,10 +48,7 @@ public class MailService extends CoreService {
         Intent i = new Intent();
         i.setClass(context, MailService.class);
         i.setAction(MailService.ACTION_RESTART_PUSHERS);
-        addWakeLockId(i, wakeLockId);
-        if (wakeLockId == null) {
-            addWakeLock(context, i);
-        }
+        addWakeLockId(context, i, wakeLockId, true);
         context.startService(i);
     }
 
@@ -64,10 +56,7 @@ public class MailService extends CoreService {
         Intent i = new Intent();
         i.setClass(context, MailService.class);
         i.setAction(MailService.ACTION_RESCHEDULE_POLL);
-        addWakeLockId(i, wakeLockId);
-        if (wakeLockId == null) {
-            addWakeLock(context, i);
-        }
+        addWakeLockId(context, i, wakeLockId, true);
         context.startService(i);
     }
 
@@ -75,7 +64,7 @@ public class MailService extends CoreService {
         Intent i = new Intent();
         i.setClass(context, MailService.class);
         i.setAction(MailService.ACTION_CANCEL);
-        addWakeLockId(i, wakeLockId);
+        addWakeLockId(context, i, wakeLockId, false); // CK:Q: why should we not create a wake lock if one is not already existing like for example in actionReschedulePoll?
         context.startService(i);
     }
 
@@ -83,7 +72,7 @@ public class MailService extends CoreService {
         Intent i = new Intent();
         i.setClass(context, MailService.class);
         i.setAction(MailService.CONNECTIVITY_CHANGE);
-        addWakeLockId(i, wakeLockId);
+        addWakeLockId(context, i, wakeLockId, false); // CK:Q: why should we not create a wake lock if one is not already existing like for example in actionReschedulePoll?
         context.startService(i);
     }
 
@@ -96,7 +85,6 @@ public class MailService extends CoreService {
 
     @Override
     public void startService(Intent intent, int startId) {
-        Integer startIdObj = startId;
         long startTime = System.currentTimeMillis();
         try {
             boolean oldIsSyncDisabled = isSyncDisabled();
@@ -147,45 +135,33 @@ public class MailService extends CoreService {
             if (ACTION_CHECK_MAIL.equals(intent.getAction())) {
                 if (K9.DEBUG)
                     Log.i(K9.LOG_TAG, "***** MailService *****: checking mail");
-
                 if (hasConnectivity && doBackground) {
                     PollService.startService(this);
                 }
-                reschedulePoll(hasConnectivity, doBackground, startIdObj, false);
-                startIdObj = null;
+                reschedulePoll(hasConnectivity, doBackground, startId, false);
             } else if (ACTION_CANCEL.equals(intent.getAction())) {
                 if (K9.DEBUG)
                     Log.v(K9.LOG_TAG, "***** MailService *****: cancel");
-
                 cancel();
             } else if (ACTION_RESET.equals(intent.getAction())) {
                 if (K9.DEBUG)
                     Log.v(K9.LOG_TAG, "***** MailService *****: reschedule");
-
-                rescheduleAll(hasConnectivity, doBackground, startIdObj);
-                startIdObj = null;
-
+                rescheduleAll(hasConnectivity, doBackground, startId); 
             } else if (ACTION_RESTART_PUSHERS.equals(intent.getAction())) {
                 if (K9.DEBUG)
                     Log.v(K9.LOG_TAG, "***** MailService *****: restarting pushers");
-                reschedulePushers(hasConnectivity, doBackground, startIdObj);
-                startIdObj = null;
-
+                reschedulePushers(hasConnectivity, doBackground, startId);
             } else if (ACTION_RESCHEDULE_POLL.equals(intent.getAction())) {
                 if (K9.DEBUG)
                     Log.v(K9.LOG_TAG, "***** MailService *****: rescheduling poll");
-                reschedulePoll(hasConnectivity, doBackground, startIdObj, true);
-                startIdObj = null;
-
+                reschedulePoll(hasConnectivity, doBackground, startId, true);
             } else if (ACTION_REFRESH_PUSHERS.equals(intent.getAction())) {
                 if (hasConnectivity && doBackground) {
                     refreshPushers(null);
-                    schedulePushers(startIdObj);
-                    startIdObj = null;
+                    schedulePushers(startId);
                 }
             } else if (CONNECTIVITY_CHANGE.equals(intent.getAction())) {
-                rescheduleAll(hasConnectivity, doBackground, startIdObj);
-                startIdObj = null;
+                rescheduleAll(hasConnectivity, doBackground, startId);
                 if (K9.DEBUG)
                     Log.i(K9.LOG_TAG, "Got connectivity action with hasConnectivity = " + hasConnectivity + ", doBackground = " + doBackground);
             } else if (CANCEL_CONNECTIVITY_NOTICE.equals(intent.getAction())) {
@@ -194,9 +170,7 @@ public class MailService extends CoreService {
                 MessagingController.getInstance(getApplication()).systemStatusChanged();
             }
         } finally {
-            if (startIdObj != null) {
-                stopSelf(startId);
-            }
+          /* nothing to do */
         }
         if (K9.DEBUG)
             Log.i(K9.LOG_TAG, "MailService.onStart took " + (System.currentTimeMillis() - startTime) + "ms");
@@ -205,7 +179,6 @@ public class MailService extends CoreService {
     private void rescheduleAll(final boolean hasConnectivity, final boolean doBackground, final Integer startId) {
         reschedulePoll(hasConnectivity, doBackground, null, true);
         reschedulePushers(hasConnectivity, doBackground, startId);
-
     }
 
 
@@ -228,7 +201,6 @@ public class MailService extends CoreService {
     private final static String LAST_CHECK_END = "MailService.lastCheckEnd";
 
     public static void saveLastCheckEnd(Context context) {
-
         long lastCheckEnd = System.currentTimeMillis();
         if (K9.DEBUG)
             Log.i(K9.LOG_TAG, "Saving lastCheckEnd = " + new Date(lastCheckEnd));
@@ -249,6 +221,13 @@ public class MailService extends CoreService {
                     SharedPreferences sPrefs = prefs.getPreferences();
                     int previousInterval = sPrefs.getInt(PREVIOUS_INTERVAL, -1);
                     long lastCheckEnd = sPrefs.getLong(LAST_CHECK_END, -1);
+
+                    if (lastCheckEnd > System.currentTimeMillis()) {
+                        Log.i(K9.LOG_TAG, "The database claims that the last time mail was checked was in the future. ("+lastCheckEnd+"). To try to get things back to normal, the last check time has been reset to "+System.currentTimeMillis());
+                        lastCheckEnd = System.currentTimeMillis();
+                    }
+
+
                     for (Account account : prefs.getAccounts()) {
                         if (account.getAutomaticCheckIntervalMinutes() != -1
                                 && account.getFolderSyncMode() != FolderMode.NONE
@@ -320,7 +299,6 @@ public class MailService extends CoreService {
     private void reschedulePushers(final boolean hasConnectivity, final boolean doBackground, final Integer startId) {
         execute(getApplication(), new Runnable() {
             public void run() {
-
                 if (K9.DEBUG)
                     Log.i(K9.LOG_TAG, "Rescheduling pushers");
                 stopPushers(null);
@@ -330,7 +308,6 @@ public class MailService extends CoreService {
                 } else {
                     if (K9.DEBUG) {
                         Log.i(K9.LOG_TAG, "Not scheduling pushers:  connectivity? " + hasConnectivity + " -- doBackground? " + doBackground);
-
                     }
                 }
 
@@ -433,13 +410,11 @@ public class MailService extends CoreService {
 
 
     @Override
-    public IBinder onBind(Intent intent) {
+    public IBinder onBind(@SuppressWarnings("unused") Intent intent) {
         return null;
     }
 
     public static long getNextPollTime() {
         return nextCheck;
     }
-
-
 }
diff --git a/src/com/fsck/k9/service/PollService.java b/src/com/fsck/k9/service/PollService.java
index b8d1b60e4..e7e471c30 100644
--- a/src/com/fsck/k9/service/PollService.java
+++ b/src/com/fsck/k9/service/PollService.java
@@ -35,6 +35,12 @@ public class PollService extends CoreService {
         context.startService(i);
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        setAutoShutdown(false);
+    }
+
     @Override
     public void startService(Intent intent, int startId) {
         if (START_SERVICE.equals(intent.getAction())) {
diff --git a/src/com/fsck/k9/service/PushService.java b/src/com/fsck/k9/service/PushService.java
index e773b042b..6be36629a 100644
--- a/src/com/fsck/k9/service/PushService.java
+++ b/src/com/fsck/k9/service/PushService.java
@@ -39,6 +39,13 @@ public class PushService extends CoreService {
 
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        setAutoShutdown(false);
+    }
+
+
     @Override
     public IBinder onBind(Intent arg0) {
         // TODO Auto-generated method stub
diff --git a/src/com/fsck/k9/service/RemoteControlService.java b/src/com/fsck/k9/service/RemoteControlService.java
index fd088e462..45d1885f5 100644
--- a/src/com/fsck/k9/service/RemoteControlService.java
+++ b/src/com/fsck/k9/service/RemoteControlService.java
@@ -27,10 +27,7 @@ public class RemoteControlService extends CoreService {
         //  Intent i = new Intent();
         i.setClass(context, RemoteControlService.class);
         i.setAction(RemoteControlService.SET_ACTION);
-        addWakeLockId(i, wakeLockId);
-        if (wakeLockId == null) {
-            addWakeLock(context, i);
-        }
+        addWakeLockId(context, i, wakeLockId, true);
         context.startService(i);
     }
 
diff --git a/src/com/fsck/k9/service/SleepService.java b/src/com/fsck/k9/service/SleepService.java
index 425ee70d6..1f365454d 100644
--- a/src/com/fsck/k9/service/SleepService.java
+++ b/src/com/fsck/k9/service/SleepService.java
@@ -114,11 +114,15 @@ public class SleepService extends CoreService {
 
     @Override
     public void startService(Intent intent, int startId) {
-        if (intent.getAction().startsWith(ALARM_FIRED)) {
-            Integer id = intent.getIntExtra(LATCH_ID, -1);
-            endSleep(id);
+        try {
+          if (intent.getAction().startsWith(ALARM_FIRED)) {
+              Integer id = intent.getIntExtra(LATCH_ID, -1);
+              endSleep(id);
+          }
+        }
+        finally {
+          stopSelf(startId);
         }
-        stopSelf(startId);
     }
 
     private static class SleepDatum {
diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java
index 21fea308b..cf24aa322 100644
--- a/src/com/fsck/k9/view/AttachmentView.java
+++ b/src/com/fsck/k9/view/AttachmentView.java
@@ -1,7 +1,16 @@
 package com.fsck.k9.view;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.commons.io.IOUtils;
+
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -9,7 +18,12 @@ import android.os.Environment;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
-import android.widget.*;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
@@ -23,9 +37,6 @@ import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBodyPart;
 import com.fsck.k9.provider.AttachmentProvider;
-import org.apache.commons.io.IOUtils;
-
-import java.io.*;
 
 public class AttachmentView extends FrameLayout {
 
@@ -42,6 +53,8 @@ public class AttachmentView extends FrameLayout {
     public long size;
     public ImageView iconView;
 
+    private AttachmentFileDownloadCallback callback;
+
     public AttachmentView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         mContext = context;
@@ -56,7 +69,18 @@ public class AttachmentView extends FrameLayout {
     }
 
 
-
+    public interface AttachmentFileDownloadCallback {
+        /**
+         * this method i called by the attachmentview when
+         * he wants to show a filebrowser
+         * the provider should show the filebrowser activity
+         * and save the reference to the attachment view for later.
+         * in his onActivityResult he can get the saved reference and
+         * call the saveFile method of AttachmentView
+         * @param view
+         */
+        public void showFileBrowser(AttachmentView caller);
+    }
     public boolean populateFromPart(Part inputPart, Message message, Account account, MessagingController controller, MessagingListener listener) {
         try {
             part = (LocalAttachmentBodyPart) inputPart;
@@ -78,10 +102,7 @@ public class AttachmentView extends FrameLayout {
             mListener = listener;
 
             size = Integer.parseInt(MimeUtility.getHeaderParameter(contentDisposition, "size"));
-            contentType = part.getMimeType();
-            if (MimeUtility.DEFAULT_ATTACHMENT_MIME_TYPE.equalsIgnoreCase(contentType)) {
-                contentType = MimeUtility.getMimeTypeByExtension(name);
-            }
+            contentType = MimeUtility.getMimeTypeForViewing(part.getMimeType(), name);
             TextView attachmentName = (TextView) findViewById(R.id.attachment_name);
             TextView attachmentInfo = (TextView) findViewById(R.id.attachment_info);
             ImageView attachmentIcon = (ImageView) findViewById(R.id.attachment_icon);
@@ -116,6 +137,14 @@ public class AttachmentView extends FrameLayout {
                     return;
                 }
             });
+            downloadButton.setOnLongClickListener(new OnLongClickListener() {
+
+                @Override
+                public boolean onLongClick(View v) {
+                    callback.showFileBrowser(AttachmentView.this);
+                    return true;
+                }
+            });
 
             attachmentName.setText(name);
             attachmentInfo.setText(SizeFormatter.formatSize(mContext, size));
@@ -161,9 +190,13 @@ public class AttachmentView extends FrameLayout {
         saveFile();
     }
 
-    public void writeFile() {
+    /**
+     * Writes the attachment onto the given path
+     * @param directory: the base dir where the file should be saved.
+     */
+    public void writeFile(File directory) {
         try {
-            File file = Utility.createUniqueFile(Environment.getExternalStorageDirectory(), name);
+            File file = Utility.createUniqueFile(directory, name);
             Uri uri = AttachmentProvider.getAttachmentUri(mAccount, part.getAttachmentId());
             InputStream in = mContext.getContentResolver().openInputStream(uri);
             OutputStream out = new FileOutputStream(file);
@@ -171,14 +204,22 @@ public class AttachmentView extends FrameLayout {
             out.flush();
             out.close();
             in.close();
-            attachmentSaved(file.getName());
+            attachmentSaved(file.toString());
             new MediaScannerNotifier(mContext, file);
         } catch (IOException ioe) {
             attachmentNotSaved();
         }
     }
+    /**
+     * saves the file to the defaultpath setting in the config, or if the config
+     * is not set => to the Environment
+     */
+    public void writeFile() {
+        writeFile(new File(K9.getAttachmentDefaultPath()));
+    }
 
     public void saveFile() {
+        //TODO: Can the user save attachments on the internal filesystem or sd card only?
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
             /*
              * Abort early if there's no place to save the attachment. We don't want to spend
@@ -196,7 +237,7 @@ public class AttachmentView extends FrameLayout {
 
 
     public void showFile() {
-        Uri uri = AttachmentProvider.getAttachmentUri(mAccount, part.getAttachmentId());
+        Uri uri = AttachmentProvider.getAttachmentUriForViewing(mAccount, part.getAttachmentId());
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(uri);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -227,7 +268,7 @@ public class AttachmentView extends FrameLayout {
             return;
         }
         try {
-            Uri uri = AttachmentProvider.getAttachmentUri(mAccount, part.getAttachmentId());
+            Uri uri = AttachmentProvider.getAttachmentUriForViewing(mAccount, part.getAttachmentId());
             Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setData(uri);
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -251,4 +292,11 @@ public class AttachmentView extends FrameLayout {
                        mContext.getString(R.string.message_view_status_attachment_not_saved),
                        Toast.LENGTH_LONG).show();
     }
+    public AttachmentFileDownloadCallback getCallback() {
+        return callback;
+    }
+    public void setCallback(AttachmentFileDownloadCallback callback) {
+        this.callback = callback;
+    }
+
 }
diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java
index d5a45a247..9871e503e 100644
--- a/src/com/fsck/k9/view/MessageWebView.java
+++ b/src/com/fsck/k9/view/MessageWebView.java
@@ -95,7 +95,7 @@ public class MessageWebView extends WebView {
 
         webSettings.setTextSize(K9.getFontSizes().getMessageViewContent());
 
-        // Disable network images by default.  This is overriden by preferences.
+        // Disable network images by default.  This is overridden by preferences.
         blockNetworkData(true);
     }
 
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 3f0ceb146..29e0d9127 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -44,7 +44,7 @@ public class SingleMessageView extends LinearLayout {
     private Button mDownloadRemainder;
     private LayoutInflater mInflater;
     private Contacts mContacts;
-
+    private AttachmentView.AttachmentFileDownloadCallback attachmentCallback;
 
     public void initialize(Activity activity) {
         mMessageContentView = (MessageWebView) findViewById(R.id.message_content);
@@ -197,9 +197,12 @@ public class SingleMessageView extends LinearLayout {
             // button wasn't already pressed, see if the user's preferences has us
             // showing them anyway.
             if (Utility.hasExternalImages(text) && !showPictures()) {
+                Address[] from = message.getFrom();
                 if ((account.getShowPictures() == Account.ShowPictures.ALWAYS) ||
                         ((account.getShowPictures() == Account.ShowPictures.ONLY_FROM_CONTACTS) &&
-                         mContacts.isInContacts(message.getFrom()[0].getAddress()))) {
+                         // Make sure we have at least one from address
+                         (from != null && from.length > 0) &&
+                         mContacts.isInContacts(from[0].getAddress()))) {
                     setLoadPictures(true);
                 } else {
                     showShowPicturesSection(true);
@@ -265,6 +268,7 @@ public class SingleMessageView extends LinearLayout {
                 return;
             }
             AttachmentView view = (AttachmentView)mInflater.inflate(R.layout.message_view_attachment, null);
+            view.setCallback(attachmentCallback);
             if (view.populateFromPart(part, message, account, controller, listener)) {
                 addAttachment(view);
             }
@@ -299,4 +303,14 @@ public class SingleMessageView extends LinearLayout {
         mMessageContentView.clearView();
         mAttachments.removeAllViews();
     }
+
+    public AttachmentView.AttachmentFileDownloadCallback getAttachmentCallback() {
+        return attachmentCallback;
+    }
+
+    public void setAttachmentCallback(
+        AttachmentView.AttachmentFileDownloadCallback attachmentCallback) {
+        this.attachmentCallback = attachmentCallback;
+    }
+
 }
diff --git a/tests/default.properties b/tests/default.properties
index 4686f7f8d..66db0d159 100644
--- a/tests/default.properties
+++ b/tests/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-9
+target=android-10
diff --git a/tests/src/com/fsck/k9/activity/AccountsTest.java b/tests/src/com/fsck/k9/activity/AccountsTest.java
index 54a5d3670..81ef1c5f8 100644
--- a/tests/src/com/fsck/k9/activity/AccountsTest.java
+++ b/tests/src/com/fsck/k9/activity/AccountsTest.java
@@ -1,4 +1,4 @@
-package com.fsck.k9;
+package com.fsck.k9.activity;
 
 import android.test.ActivityInstrumentationTestCase2;
 import com.fsck.k9.activity.Accounts;
diff --git a/tools/build-beta b/tools/build-beta
index 20a795828..129f1a028 100644
--- a/tools/build-beta
+++ b/tools/build-beta
@@ -1,12 +1,16 @@
-perl -pi -e's|\@string/app_name|\@string/beta_app_name|g' AndroidManifest.xml
-perl -pi -e's|com/fsck/k9/R.java|com/fsck/k9beta/R.java|g' build.xml
-find src/com/fsck -type f |xargs -n 1 perl -pi -e's|com.\fsck\.k9|com.fsck.k9beta|g'
-mv src/com/fsck/k9 src/com/fsck/k9beta
-perl -pi -e's|K9|K9-BETA|g' build.xml
+BETA_PACKAGE=com.fsck.k9beta
+BETA_PATH=com/fsck/k9beta
+BETA_PROJ_NAME="K9 Beta"
+perl -pi -e"s|\@string/app_name|\@string/beta_app_name|g" AndroidManifest.xml
+perl -pi -e"s|com/fsck/k9/R.java|$BETA_PATH/R.java|g" build.xml
+find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/com.fsck.k9(?=\W)/$BETA_PACKAGE/g"
+perl -pi -e"s|com.fsck.k9|$BETA_PACKAGE|g" AndroidManifest.xml
+mv src/com/fsck/k9 src/$BETA_PATH
+perl -pi -e"s|K9|$BETA_PROJ_NAME|g" build.xml
 ant $@
-#mv src/com/fsck/k9beta src/com/fsck/k9
-#perl -pi -e's|K9-BETA|K9|g' build.xml
-#perl -pi -e's|com\.fsck\.k9beta|com.fsck.k9|g' build.xml AndroidManifest.xml src/com/fsck/k9/provider/AttachmentProvider.java
-#perl -pi -e's|com/fsck/k9beta/R.java|com/fsck/k9/R.java|g' build.xml
-#perl -pi -e's|\@string/beta_app_name|\@string/app_name|g' AndroidManifest.xml
-#find src/com/fsck -type f |xargs -n 1 perl -pi -e's|com.fsck.k9beta|com.fsck.k9|'
+mv src/$BETA_PATH src/com/fsck/k9
+perl -pi -e"s|$BETA_PACKAGE|com.fsck.k9|g" AndroidManifest.xml
+perl -pi -e"s|$BETA_PATH/R.java|com/fsck.k9/R.java|g" build.xml
+find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/$BETA_PACKAGE(?=\W)/com.fsck.k9/g"
+perl -pi -e"s|$BETA_PROJ_NAME|K9|g" build.xml
+perl -pi -e"s|\@string/beta_app_name|\@string/app_name|g" AndroidManifest.xml
diff --git a/tools/eclipse-settings/org.eclipse.core.resources.prefs b/tools/eclipse-settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..7d91642f3
--- /dev/null
+++ b/tools/eclipse-settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Sat Apr 30 16:23:39 CEST 2011
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tools/eclipse-settings/org.eclipse.jdt.core.prefs b/tools/eclipse-settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..04d056364
--- /dev/null
+++ b/tools/eclipse-settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,358 @@
+#Tue Jun 07 20:07:23 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=m
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=s
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=100
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tools/eclipse-settings/org.eclipse.jdt.ui.prefs b/tools/eclipse-settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..5cfbf32fa
--- /dev/null
+++ b/tools/eclipse-settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,65 @@
+#Tue Jun 07 19:46:27 CEST 2011
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=true
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=true
+cleanup.make_private_fields_final=false
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=false
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=true
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=true
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_K-9 Mail
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_K-9 Mail
+formatter_settings_version=11
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=android;com;junit;net;org;java;javax;
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99