diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index df3071b3a3..d126ff1db0 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">ضوء الإشعارات</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -174,12 +175,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">وتظهر في علبة موحد</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
@@ -277,6 +279,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -289,6 +294,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -318,6 +324,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index df3071b3a3..d126ff1db0 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">ضوء الإشعارات</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -174,12 +175,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">وتظهر في علبة موحد</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
@@ -277,6 +279,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -289,6 +294,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -318,6 +324,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index df3071b3a3..d126ff1db0 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">ضوء الإشعارات</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -174,12 +175,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">وتظهر في علبة موحد</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
@@ -277,6 +279,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -289,6 +294,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -318,6 +324,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index df3071b3a3..d126ff1db0 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">ضوء الإشعارات</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -174,12 +175,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">وتظهر في علبة موحد</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
@@ -277,6 +279,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -289,6 +294,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -318,6 +324,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index df3071b3a3..d126ff1db0 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -107,6 +107,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">ضوء الإشعارات</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -174,12 +175,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">وتظهر في علبة موحد</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
@@ -277,6 +279,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -289,6 +294,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -318,6 +324,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 26ef773f21..597aebb2a1 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">İdentikon-ları göstər</string>
     <string name="title_advanced_preview">Mesaj ilkin baxışını göstər</string>
     <string name="title_advanced_light">Bildiriş işığından istifadə et</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_advanced_swipe">Sürüşdürmə hərəkətləri</string>
     <string name="title_advanced_actionbar">Söhbət hərəkət sətri</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Bütün tullantı mesajları birdəfəlik silinsin?</string>
     <string name="title_folder_name">Qovluq adı</string>
     <string name="title_display_name">Ekran adı</string>
-    <string name="title_hide_folder">Siyahıdan gizlət</string>
     <string name="title_hide_folders">Gizli qovluqları gizlət</string>
     <string name="title_show_folders">Gizli qovluqları göstər</string>
+    <string name="title_hide_folder">Siyahıdan gizlət</string>
+    <string name="title_unified_folder">Birləşmiş gələn qutusunda göstər</string>
     <string name="title_synchronize_folder">Eyniləşdir (mesajları al)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Birləşmiş gələn qutusunda göstər</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Eyniləşdirilmiş mesajlar (gün)</string>
     <string name="title_keep_days">Saxlanılmış mesajlar (gün)</string>
     <string name="title_folder_exists">%1$s qovluğu mövcuddur</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Vaxt</string>
     <string name="title_sort_on_unread">Oxunmadı</string>
     <string name="title_sort_on_starred">Ulduzlu</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Göndərilənlərə köçürt</string>
     <string name="title_previous">Əvvəlki</string>
     <string name="title_next">Növbəti</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Arxiv</string>
     <string name="title_action_trash">Tullantı</string>
     <string name="title_legend_inbox">Gələn qutusu</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Birləşmiş gələn qutusu</string>
     <string name="title_legend_archive">Arxiv</string>
     <string name="title_legend_trash">Tullantı</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Bir neçə mesajı seçməyə başlamaq üçün bir mesaja uzun basın</string>
     <string name="title_hint_sync">Mesajların endirilməsi təchizatçınızın sürətindən, internet bağlantınızdan və mesaj sayından asılı olaraq biraz vaxt apara bilər. Mesajları endirərkən tətbiq yavaş cavab verə bilər.</string>
     <string name="title_open_link">Bağlantını aç</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">%1$s versiyası üçün yeniləmə mövcuddur</string>
     <string name="title_issue">Sualınız və ya probleminiz var?</string>
     <string name="title_yes">Bəli</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 966aa46fd4..ffd7b18dc4 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Utilitza el led de notificacions</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Busca missatges en el servidor remot</string>
     <string name="title_advanced_swipe">Accions per lliscar</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Vols buidar la paperera?</string>
     <string name="title_folder_name">Nom de carpeta</string>
     <string name="title_display_name">Mostrar el nom</string>
-    <string name="title_hide_folder">Amagar de la llista</string>
     <string name="title_hide_folders">Amaga les carpetes ocultes</string>
     <string name="title_show_folders">Mostra les carpetes ocultes</string>
+    <string name="title_hide_folder">Amagar de la llista</string>
+    <string name="title_unified_folder">Mostra en la safata d\'entrada unificada</string>
     <string name="title_synchronize_folder">Sincronitza (rebre missatges)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Mostra en la safata d\'entrada unificada</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">La carpeta %1$s existeix</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Data</string>
     <string name="title_sort_on_unread">Sense llegir</string>
     <string name="title_sort_on_starred">Destacats</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Anterior</string>
     <string name="title_next">Següent</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Safata d\'entrada</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Safata d\'entrada unificada</string>
     <string name="title_legend_archive">Arxiu</string>
     <string name="title_legend_trash">Paperera</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Obrir l\'enllaç</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Hi ha disponible una actualització a la versió %1$s</string>
     <string name="title_issue">Tens alguna pregunta o problema?</string>
     <string name="title_yes">Sí</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4fc7aade65..35cddfbd9e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a525cde1e8..d8ba703ab3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Mappenavn</string>
     <string name="title_display_name">Visningsnavn</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synkronisér (modtag meddelelser)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Ulæst</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Forrige</string>
     <string name="title_next">Næste</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Arkivér</string>
     <string name="title_action_trash">Papirkurv</string>
     <string name="title_legend_inbox">Indbakke</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Samlet indbakke</string>
     <string name="title_legend_archive">Arkivér</string>
     <string name="title_legend_trash">Papirkurv</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Åben link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Har du et spørgsmål eller et problem?</string>
     <string name="title_yes">Ja</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e2ced1b027..92105d0320 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Identicons als Kontaktbilder anzeigen</string>
     <string name="title_advanced_preview">Nachrichtenvorschau anzeigen</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_swipe">Wischgesten</string>
     <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Alle E-Mails im Papierkorb unwiderruflich löschen?</string>
     <string name="title_folder_name">Ordnername</string>
     <string name="title_display_name">Name</string>
-    <string name="title_hide_folder">Ordner ausblenden</string>
     <string name="title_hide_folders">Verstecke ausgeblendete Ordner</string>
     <string name="title_show_folders">Zeige ausgeblendete Ordner</string>
+    <string name="title_hide_folder">Ordner ausblenden</string>
+    <string name="title_unified_folder">Im Sammeleingang anzeigen</string>
     <string name="title_synchronize_folder">Synchronisieren (E-Mails empfangen)</string>
     <string name="title_poll_folder">Periodisch überprüfen anstelle einer dauerhaften Synchronisierung</string>
-    <string name="title_unified_folder">Im Sammeleingang anzeigen</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Zu synchronisierende E-Mails (Tage)</string>
     <string name="title_keep_days">E-Mails aufbewahren (Tage)</string>
     <string name="title_folder_exists">Ordner %1$s bereits vorhanden</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Uhrzeit</string>
     <string name="title_sort_on_unread">Ungelesen</string>
     <string name="title_sort_on_starred">Favoriten</string>
+    <string name="title_address_sent">Gesendet:</string>
+    <string name="title_address_unsent">Nicht gesendet:</string>
+    <string name="title_address_invalid">Ungültig:</string>
     <string name="title_move_sent">In den Gesendet-Ordner verschieben</string>
     <string name="title_previous">Vorherige</string>
     <string name="title_next">Nächste</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archivieren</string>
     <string name="title_action_trash">Löschen</string>
     <string name="title_legend_inbox">Posteingang</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Sammeleingang</string>
     <string name="title_legend_archive">Archiv</string>
     <string name="title_legend_trash">Papierkorb</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Lange auf eine Nachricht drücken, um mehrere Nachrichten auszuwählen</string>
     <string name="title_hint_sync">Das Herunterladen von E-Mails kann einige Zeit in Anspruch nehmen, abhängig von der Geschwindigkeit des Providers, der Internetverbindung, des Gerätes und von der Anzahl der E-Mails. Beim Herunterladen der E-Mails kann die App träge reagieren.</string>
     <string name="title_open_link">Link öffnen</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Es ist ein Update auf Version %1$s verfügbar</string>
     <string name="title_issue">Haben Sie eine Frage oder ein Problem?</string>
     <string name="title_yes">Ja</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 9ff2fa06f6..50a21702a2 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Mostrar identicons</string>
     <string name="title_advanced_preview">Mostrar vista previa de mensajes</string>
     <string name="title_advanced_light">Usar luz de notificación</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
     <string name="title_advanced_swipe">Acciones al deslizar</string>
     <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">¿Eliminar los mensajes de la Papelera permanentemente?</string>
     <string name="title_folder_name">Nombre de carpeta</string>
     <string name="title_display_name">Nombre para mostrar</string>
-    <string name="title_hide_folder">Ocultar de la lista</string>
     <string name="title_hide_folders">Ocultar carpetas ocultas</string>
     <string name="title_show_folders">Mostrar carpetas ocultas</string>
+    <string name="title_hide_folder">Ocultar de la lista</string>
+    <string name="title_unified_folder">Mostrar en Bandeja de Entrada Unificada</string>
     <string name="title_synchronize_folder">Sincronizar (recibir mensajes)</string>
     <string name="title_poll_folder">Comprobar periódicamente en lugar de sincronizar continuamente</string>
-    <string name="title_unified_folder">Mostrar en Bandeja de Entrada Unificada</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Sincronizar mensajes (días)</string>
     <string name="title_keep_days">Mantener mensajes (días)</string>
     <string name="title_folder_exists">La carpeta %1$s ya existe</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Tiempo</string>
     <string name="title_sort_on_unread">No leído</string>
     <string name="title_sort_on_starred">Destacado</string>
+    <string name="title_address_sent">Enviados:</string>
+    <string name="title_address_unsent">No enviados:</string>
+    <string name="title_address_invalid">Inválidos:</string>
     <string name="title_move_sent">Mover a enviados</string>
     <string name="title_previous">Anterior</string>
     <string name="title_next">Siguiente</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archivar</string>
     <string name="title_action_trash">Mover a Papelera</string>
     <string name="title_legend_inbox">Bandeja de Entrada</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Bandeja de Entrada Unificada</string>
     <string name="title_legend_archive">Archivo</string>
     <string name="title_legend_trash">Papelera</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Mantenga presionado un mensaje para empezar a seleccionar múltiples mensajes</string>
     <string name="title_hint_sync">Descargar mensajes puede llevar algún tiempo, dependiendo de la velocidad del proveedor, la conexión a internet, dispositivo y el número de mensajes. Mientras se descargan mensajes, la aplicación puede responder más lentamente.</string>
     <string name="title_open_link">Abrir enlace</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Hay una actualización a la version %1$s disponible</string>
     <string name="title_issue">¿Tiene una pregunta o problema?</string>
     <string name="title_yes">Sí</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 827cadb8a8..748a4304f9 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8b4c264be6..141029a38d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Afficher les identicônes</string>
     <string name="title_advanced_preview">Afficher l’aperçu du message</string>
     <string name="title_advanced_light">Utiliser le voyant de notification</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
     <string name="title_advanced_swipe">Gestes de balayage</string>
     <string name="title_advanced_actionbar">Barre d’action de conversation</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Supprimer définitivement tous les messages de la corbeille ?</string>
     <string name="title_folder_name">Nom du dossier</string>
     <string name="title_display_name">Nom</string>
-    <string name="title_hide_folder">Masquer dans la liste</string>
     <string name="title_hide_folders">Masquer les dossiers cachés</string>
     <string name="title_show_folders">Afficher les dossiers cachés</string>
+    <string name="title_hide_folder">Masquer dans la liste</string>
+    <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
     <string name="title_synchronize_folder">Synchroniser (recevoir des messages)</string>
     <string name="title_poll_folder">Vérifier périodiquement au lieu de synchroniser en continu</string>
-    <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchroniser les e-mails (jours)</string>
     <string name="title_keep_days">Conserver les e-mails (jours)</string>
     <string name="title_folder_exists">Le dossier %1$s existe</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Date</string>
     <string name="title_sort_on_unread">Non lu(s)</string>
     <string name="title_sort_on_starred">Suivis</string>
+    <string name="title_address_sent">Envoyé :</string>
+    <string name="title_address_unsent">Non envoyé :</string>
+    <string name="title_address_invalid">Invalide :</string>
     <string name="title_move_sent">Déplacer dans Envoyés</string>
     <string name="title_previous">Précédent</string>
     <string name="title_next">Suivant</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archiver</string>
     <string name="title_action_trash">Supprimer</string>
     <string name="title_legend_inbox">Boîte de réception</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Boite de réception unifiée</string>
     <string name="title_legend_archive">Archives</string>
     <string name="title_legend_trash">Corbeille</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Appuyer longtemps sur un message pour commencer à en sélectionner plusieurs</string>
     <string name="title_hint_sync">Le téléchargement des messages peut prendre un certain temps selon la vitesse du fournisseur d\'accès, la connexion internet et le périphérique et selon le nombre de messages. Lors du téléchargement des messages, l’application peut répondre plus lentement.</string>
     <string name="title_open_link">Ouvrir le lien</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Une mise à jour vers la version %1$s est disponible</string>
     <string name="title_issue">Avez-vous une question ou un problème ?</string>
     <string name="title_yes">Oui</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index aac455e31e..9cd65eb135 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index aca424965f..3946de88fd 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 93a6b48ffe..d63953f373 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Visualizza identicon</string>
     <string name="title_advanced_preview">Mostra l\'anteprima del messaggio</string>
     <string name="title_advanced_light">Usa il led di notifica</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
     <string name="title_advanced_swipe">Azioni swipe</string>
     <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Eliminare definitivamente tutti i messaggi cestinati?</string>
     <string name="title_folder_name">Nome cartella</string>
     <string name="title_display_name">Nome visualizzato</string>
-    <string name="title_hide_folder">Nascondi dall\'elenco</string>
     <string name="title_hide_folders">Non mostrare cartelle nascoste</string>
     <string name="title_show_folders">Mostra cartelle nascoste</string>
+    <string name="title_hide_folder">Nascondi dall\'elenco</string>
+    <string name="title_unified_folder">Mostra in posta in arrivo unificata</string>
     <string name="title_synchronize_folder">Sincronizza (ricevi messaggi)</string>
     <string name="title_poll_folder">Controllare periodicamente anziché sincronizzare continuamente</string>
-    <string name="title_unified_folder">Mostra in posta in arrivo unificata</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Sincronizza i messaggi (giorni)</string>
     <string name="title_keep_days">Mantieni i messaggi (giorni)</string>
     <string name="title_folder_exists">La cartella %1$s esiste</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Ora</string>
     <string name="title_sort_on_unread">Non letti</string>
     <string name="title_sort_on_starred">Stellati</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Sposta in posta inviata</string>
     <string name="title_previous">Precedente</string>
     <string name="title_next">Successivo</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archivia</string>
     <string name="title_action_trash">Cestina</string>
     <string name="title_legend_inbox">Posta in arrivo</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Posta in arrivo unificata</string>
     <string name="title_legend_archive">Archivio</string>
     <string name="title_legend_trash">Cestino</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Premi a lungo un messaggio per iniziare a selezionare più messaggi</string>
     <string name="title_hint_sync">Scaricare i messaggi può richiedere molto tempo, a seconda della velocità del provider, della connessione internet e del dispositivo e dal numero di messaggi. Durante il download l\'app potrebbe funzionare più lentamente.</string>
     <string name="title_open_link">Apri collegamento</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">È disponibile un aggiornamento alla versione %1$s</string>
     <string name="title_issue">Hai una domanda o un problema?</string>
     <string name="title_yes">Sì</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index aac455e31e..9cd65eb135 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b370b49140..5df1597418 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -82,6 +82,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -149,12 +150,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -252,6 +254,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -264,6 +269,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -293,6 +299,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b370b49140..5df1597418 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -82,6 +82,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -149,12 +150,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -252,6 +254,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -264,6 +269,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -293,6 +299,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 86a9645dba..68f1988611 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Toon identicons</string>
     <string name="title_advanced_preview">Bericht voorvertoning</string>
     <string name="title_advanced_light">Gebruik meldingslicht</string>
+    <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
     <string name="title_advanced_browse">Blader door berichten op de server</string>
     <string name="title_advanced_swipe">Veegacties</string>
     <string name="title_advanced_actionbar">Actiebalk gesprek</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Alle weggegooide berichten permanent verwijderen?</string>
     <string name="title_folder_name">Mapnaam</string>
     <string name="title_display_name">Weergavenaam</string>
-    <string name="title_hide_folder">Verberg in de lijst</string>
     <string name="title_hide_folders">Verberg verborgen mappen</string>
     <string name="title_show_folders">Toon verborgen mappen</string>
+    <string name="title_hide_folder">Verberg in de lijst</string>
+    <string name="title_unified_folder">Toon in het gecombineerde postvak in</string>
     <string name="title_synchronize_folder">Synchroniseren (ontvang berichten)</string>
     <string name="title_poll_folder">Controleer periodiek in plaats van continu synchroniseren</string>
-    <string name="title_unified_folder">Toon in het gecombineerde postvak in</string>
+    <string name="title_notify_folder">Melding bij nieuwe berichten</string>
     <string name="title_sync_days">Synchroniseren van berichten (dagen)</string>
     <string name="title_keep_days">Bewaren van berichten (dagen)</string>
     <string name="title_folder_exists">Map %1$s bestaat</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Tijd</string>
     <string name="title_sort_on_unread">Ongelezen</string>
     <string name="title_sort_on_starred">Met ster</string>
+    <string name="title_address_sent">Verzonden:</string>
+    <string name="title_address_unsent">Niet verzonden:</string>
+    <string name="title_address_invalid">Ongeldig:</string>
     <string name="title_move_sent">Verplaats naar verzonden</string>
     <string name="title_previous">Vorige</string>
     <string name="title_next">Volgende</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archiveren</string>
     <string name="title_action_trash">Weggooien</string>
     <string name="title_legend_inbox">Postvak in</string>
+    <string name="title_legend_notify">Melding bij nieuwe berichten</string>
     <string name="title_legend_unified">Gecombineerd postvak in</string>
     <string name="title_legend_archive">Archief</string>
     <string name="title_legend_trash">Prullenbak</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Druk lang op een bericht om te beginnen met het selecteren van meerdere berichten</string>
     <string name="title_hint_sync">Het downloaden van berichten kan enige tijd duren, afhankelijk van de snelheid van de provider, de internet-verbinding en het apparaat en van het aantal berichten. Tijdens het downloaden van berichten kan de app trager reageren.</string>
     <string name="title_open_link">Link openen</string>
+    <string name="title_select_app">Selecteer app</string>
     <string name="title_updated">Er is een update naar versie %1$s beschikbaar</string>
     <string name="title_issue">Heeft u een vraag of probleem?</string>
     <string name="title_yes">Ja</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 84d301cb9d..82bf8fcc63 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Pokazuje ikony kontaktów</string>
     <string name="title_advanced_preview">Pokaż podgląd wiadomości</string>
     <string name="title_advanced_light">Użyj diody powiadomień</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
     <string name="title_advanced_swipe">Gesty przesuwania</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Trwale usunąć wszystkie wiadomości z kosza?</string>
     <string name="title_folder_name">Nazwa folderu</string>
     <string name="title_display_name">Nazwa wyświetlana</string>
-    <string name="title_hide_folder">Ukryj z listy</string>
     <string name="title_hide_folders">Nie pokazuj ukrytych folderów</string>
     <string name="title_show_folders">Pokaż ukryte foldery</string>
+    <string name="title_hide_folder">Ukryj z listy</string>
+    <string name="title_unified_folder">Pokaż we wspólnej skrzynce odbiorczej</string>
     <string name="title_synchronize_folder">Synchronizuj (odbierz wiadomości)</string>
     <string name="title_poll_folder">Sprawdzaj cyklicznie zamiast ciągłej synchronizacji</string>
-    <string name="title_unified_folder">Pokaż we wspólnej skrzynce odbiorczej</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronizuj wiadomości (dni)</string>
     <string name="title_keep_days">Zachowuj wiadomości (dni)</string>
     <string name="title_folder_exists">Folder %1$s istnieje</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Czas</string>
     <string name="title_sort_on_unread">Nieprzeczytane</string>
     <string name="title_sort_on_starred">Oznaczone</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Przenieś do wysłanych</string>
     <string name="title_previous">Poprzedni</string>
     <string name="title_next">Następny</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archiwum</string>
     <string name="title_action_trash">Kosz</string>
     <string name="title_legend_inbox">Odebrane</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Wspólna skrzynka odbiorcza</string>
     <string name="title_legend_archive">Archiwum</string>
     <string name="title_legend_trash">Kosz</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Przytrzymaj wiadomość, aby zacząć zaznaczanie wielu wiadomości</string>
     <string name="title_hint_sync">Pobieranie wiadomości może trochę potrwać, zależnie od prędkości dostawcy, połączenie internetowego i urządzenia oraz liczby wiadomości. Podczas pobierania wiadomości aplikacja może odpowiadać wolniej.</string>
     <string name="title_open_link">Otwórz link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
     <string name="title_issue">Masz pytanie lub problem?</string>
     <string name="title_yes">Tak</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6330a89af1..d7b2b8c862 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ce6d5d48a8..982112fc38 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 554658f124..5e47f4d25c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -92,6 +92,7 @@
     <string name="title_advanced_identicons">Arată iconițe generate</string>
     <string name="title_advanced_preview">Arată previzualizare mesaj</string>
     <string name="title_advanced_light">Folosire LED de notificare</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
     <string name="title_advanced_swipe">Acțiuni glisare</string>
     <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
@@ -159,12 +160,13 @@
     <string name="title_empty_trash_ask">Şterge permanent toate mesajele din coșul de gunoi?</string>
     <string name="title_folder_name">Nume dosar</string>
     <string name="title_display_name">Nume afișat</string>
-    <string name="title_hide_folder">Ascunde din listă</string>
     <string name="title_hide_folders">Ascunde dosarele ascunse</string>
     <string name="title_show_folders">Arată dosarele ascunse</string>
+    <string name="title_hide_folder">Ascunde din listă</string>
+    <string name="title_unified_folder">Arată în căsuța poștală comună</string>
     <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
     <string name="title_poll_folder">Verifică periodic în loc de a sincroniza în continuu</string>
-    <string name="title_unified_folder">Arată în căsuța poștală comună</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Sincronizarea mesajelor (zile)</string>
     <string name="title_keep_days">Păstrarea mesajelor (zile)</string>
     <string name="title_folder_exists">Dosarul %1$s există</string>
@@ -262,6 +264,9 @@
     <string name="title_sort_on_time">Dată</string>
     <string name="title_sort_on_unread">Necitit</string>
     <string name="title_sort_on_starred">Marcat</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Mută la mesaje trimise</string>
     <string name="title_previous">Precedent</string>
     <string name="title_next">Următor</string>
@@ -274,6 +279,7 @@
     <string name="title_action_archive">Arhivare</string>
     <string name="title_action_trash">Gunoi</string>
     <string name="title_legend_inbox">Primite</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Căsuță poștală comună</string>
     <string name="title_legend_archive">Arhivă</string>
     <string name="title_legend_trash">Gunoi</string>
@@ -303,6 +309,7 @@
     <string name="title_hint_message_selection">Apăsați lung un mesaj pentru a selecta multiple</string>
     <string name="title_hint_sync">Descărcarea mesajelor poate dura ceva timp, în funcție de viteza furnizorului, conexiunea la internet, de dispozitiv precum și de numărul de mesaje. În timpul descărcării mesajelor aplicația ar putea răspunde mai lent.</string>
     <string name="title_open_link">Deschide legătura</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Este disponibilă o actualizare la versiunea %1$s</string>
     <string name="title_issue">Aveți o întrebare sau problemă?</string>
     <string name="title_yes">Da</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4fc7aade65..35cddfbd9e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e76ddcaa67..acc59f34c3 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -92,6 +92,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -159,12 +160,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -262,6 +264,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -274,6 +279,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -303,6 +309,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 2ec53cb865..6e08439daf 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Visa identicons</string>
     <string name="title_advanced_preview">Förhandsvisning av meddelande</string>
     <string name="title_advanced_light">Använda aviseringslampan</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Bläddra bland meddelanden på servern</string>
     <string name="title_advanced_swipe">Svepfunktioner</string>
     <string name="title_advanced_actionbar">Konversationens åtgärdsfält</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Radera alla meddelanden i papperskorgen permanent?</string>
     <string name="title_folder_name">Mappnamn</string>
     <string name="title_display_name">Visningsnamn</string>
-    <string name="title_hide_folder">Dölj från listan</string>
     <string name="title_hide_folders">Dölj dolda mappar</string>
     <string name="title_show_folders">Visa dolda mappar</string>
+    <string name="title_hide_folder">Dölj från listan</string>
+    <string name="title_unified_folder">Visa i en samlad inkorg</string>
     <string name="title_synchronize_folder">Synkronisera (hämta meddelanden)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Visa i en samlad inkorg</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synkronisera meddelanden (dagar)</string>
     <string name="title_keep_days">Behåll meddelanden (dagar)</string>
     <string name="title_folder_exists">Mappen %1$s finns</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Olästa</string>
     <string name="title_sort_on_starred">Stjärnmärkta</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Flytta till skickat</string>
     <string name="title_previous">Föregående</string>
     <string name="title_next">Nästa</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Papperskorg</string>
     <string name="title_legend_inbox">Inkorg</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Samlad inkorg</string>
     <string name="title_legend_archive">Arkivera</string>
     <string name="title_legend_trash">Papperskorg</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Tryck länge på ett meddelande för att börja välja flera meddelanden</string>
     <string name="title_hint_sync">Hämtning av meddelanden kan ta lite tid, beroende på leverantörens hastighet, internetanslutning och enhet och på antalet meddelanden. När du hämtar meddelanden kan appen svara långsammare.</string>
     <string name="title_open_link">Öppna länken</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Det finns en uppdatering till version %1$s tillgänglig</string>
     <string name="title_issue">Har du en fråga eller problem?</string>
     <string name="title_yes">Ja</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c658928d9a..5ff69c19ad 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -87,6 +87,7 @@
     <string name="title_advanced_identicons">Kimliklerini göster</string>
     <string name="title_advanced_preview">İleti önizlemesini göster</string>
     <string name="title_advanced_light">Bildirim ışığını kullan</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
     <string name="title_advanced_swipe">Kaydırma eylemleri</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -154,12 +155,13 @@
     <string name="title_empty_trash_ask">Tüm çöpe atılan iletiler kalıcı olarak silinsin mi?</string>
     <string name="title_folder_name">Klasör adı</string>
     <string name="title_display_name">Ekran adı</string>
-    <string name="title_hide_folder">Listeden gizle</string>
     <string name="title_hide_folders">Gizli klasörleri gizle</string>
     <string name="title_show_folders">Gizli klasörleri göster</string>
+    <string name="title_hide_folder">Listeden gizle</string>
+    <string name="title_unified_folder">Birleşik gelen kutusunda göster</string>
     <string name="title_synchronize_folder">Senkronize et (iletileri al)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Birleşik gelen kutusunda göster</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">İletileri eşzamanla (gün)</string>
     <string name="title_keep_days">İletileri sakla (günler)</string>
     <string name="title_folder_exists">Klasör %1$s var</string>
@@ -257,6 +259,9 @@
     <string name="title_sort_on_time">Zaman</string>
     <string name="title_sort_on_unread">Okunmadı</string>
     <string name="title_sort_on_starred">Yıldızlı</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Gönderilenlere taşı</string>
     <string name="title_previous">Önceki</string>
     <string name="title_next">Sonraki</string>
@@ -269,6 +274,7 @@
     <string name="title_action_archive">Arşiv</string>
     <string name="title_action_trash">Çöp kutusu</string>
     <string name="title_legend_inbox">Gelen kutusu</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Birleştirilmiş gelen kutusu</string>
     <string name="title_legend_archive">Arşiv</string>
     <string name="title_legend_trash">Çöp Kutusu</string>
@@ -298,6 +304,7 @@
     <string name="title_hint_message_selection">Birden çok mesaj seçmeye başlamak için bir mesaja uzun basın</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Bağlantıyı aç</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">Sürüm %1$s için bir güncelleştirme mevcut</string>
     <string name="title_issue">Bir sorunuz ya da probleminiz mi var?</string>
     <string name="title_yes">Evet</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4fc7aade65..35cddfbd9e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -97,6 +97,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -164,12 +165,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -267,6 +269,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -279,6 +284,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -308,6 +314,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index b370b49140..5df1597418 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -82,6 +82,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -149,12 +150,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -252,6 +254,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -264,6 +269,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -293,6 +299,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f147ed875a..b510ea537b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -82,6 +82,7 @@
     <string name="title_advanced_identicons">显示哈希头像</string>
     <string name="title_advanced_preview">显示邮件预览</string>
     <string name="title_advanced_light">使用指示灯</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_swipe">滑动操作</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -149,12 +150,13 @@
     <string name="title_empty_trash_ask">永久性删除所有垃圾邮件</string>
     <string name="title_folder_name">文件夹名</string>
     <string name="title_display_name">显示昵称</string>
-    <string name="title_hide_folder">从列表中隐藏</string>
     <string name="title_hide_folders">隐藏隐藏的文件夹</string>
     <string name="title_show_folders">显示隐藏的文件夹</string>
+    <string name="title_hide_folder">从列表中隐藏</string>
+    <string name="title_unified_folder">在统一的收件箱中显示</string>
     <string name="title_synchronize_folder">同步文件夹（接收）</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">在统一的收件箱中显示</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">同步邮件(天)</string>
     <string name="title_keep_days">保留邮件(天)</string>
     <string name="title_folder_exists">文件夹 %1$s 存在</string>
@@ -252,6 +254,9 @@
     <string name="title_sort_on_time">时间</string>
     <string name="title_sort_on_unread">未读</string>
     <string name="title_sort_on_starred">星标记</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">移动到已发送</string>
     <string name="title_previous">上一则</string>
     <string name="title_next">下一则</string>
@@ -264,6 +269,7 @@
     <string name="title_action_archive">存档</string>
     <string name="title_action_trash">垃圾箱</string>
     <string name="title_legend_inbox">收件箱</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">聚合收件箱</string>
     <string name="title_legend_archive">存档</string>
     <string name="title_legend_trash">垃圾箱</string>
@@ -293,6 +299,7 @@
     <string name="title_hint_message_selection">长按一则邮件以开始选择多则邮件</string>
     <string name="title_hint_sync">下载邮件可能需要一些时间, 具体取决于提供商的速度、网络连接、设备以及邮件数量。在下载邮件时, 应用的响应速度可能会变慢。</string>
     <string name="title_open_link">打开链接</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">有新的版本%1$s可用</string>
     <string name="title_issue">您要提问或有问题吗？</string>
     <string name="title_yes">是</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b370b49140..5df1597418 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -82,6 +82,7 @@
     <string name="title_advanced_identicons">Show identicons</string>
     <string name="title_advanced_preview">Show message preview</string>
     <string name="title_advanced_light">Use notification light</string>
+    <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_swipe">Swipe actions</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>
@@ -149,12 +150,13 @@
     <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
     <string name="title_folder_name">Folder name</string>
     <string name="title_display_name">Display name</string>
-    <string name="title_hide_folder">Hide from list</string>
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
+    <string name="title_hide_folder">Hide from list</string>
+    <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
-    <string name="title_unified_folder">Show in unified inbox</string>
+    <string name="title_notify_folder">Notify new messages</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
@@ -252,6 +254,9 @@
     <string name="title_sort_on_time">Time</string>
     <string name="title_sort_on_unread">Unread</string>
     <string name="title_sort_on_starred">Starred</string>
+    <string name="title_address_sent">Sent:</string>
+    <string name="title_address_unsent">Unsent:</string>
+    <string name="title_address_invalid">Invalid:</string>
     <string name="title_move_sent">Move to sent</string>
     <string name="title_previous">Previous</string>
     <string name="title_next">Next</string>
@@ -264,6 +269,7 @@
     <string name="title_action_archive">Archive</string>
     <string name="title_action_trash">Trash</string>
     <string name="title_legend_inbox">Inbox</string>
+    <string name="title_legend_notify">Notify new messages</string>
     <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
@@ -293,6 +299,7 @@
     <string name="title_hint_message_selection">Long press a message to start selecting multiple messages</string>
     <string name="title_hint_sync">Downloading messages can take some time, depending on the speed of the provider, internet connection and device and on the number of messages. While downloading messages the app might respond slower.</string>
     <string name="title_open_link">Open link</string>
+    <string name="title_select_app">Select app</string>
     <string name="title_updated">There is an update to version %1$s available</string>
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>