diff --git a/app/src/main/java/eu/faircode/email/FragmentWebView.java b/app/src/main/java/eu/faircode/email/FragmentWebView.java
index 9d8dc40372..34ac139cce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentWebView.java
+++ b/app/src/main/java/eu/faircode/email/FragmentWebView.java
@@ -23,6 +23,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -35,6 +36,7 @@ import android.widget.ProgressBar;
 // https://developer.android.com/reference/android/webkit/WebView
 
 public class FragmentWebView extends Fragment {
+    private String url = null;
 
     @Override
     @Nullable
@@ -68,8 +70,15 @@ public class FragmentWebView extends Fragment {
             }
         });
 
-        webview.loadUrl(getArguments().getString("link"));
+        url = getArguments().getString("link");
+        webview.loadUrl(url);
 
         return view;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        ((AppCompatActivity) getActivity()).getSupportActionBar().setSubtitle(url);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 29e35ed906..0723baefc7 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -20,6 +20,7 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
+import android.text.Html;
 import android.text.TextUtils;
 
 import org.jsoup.Jsoup;
@@ -36,7 +37,7 @@ import java.util.List;
 public class HtmlHelper implements NodeVisitor {
     private Context context;
     private String newline;
-    private List<String> links = new ArrayList<>();
+    private List<String> refs = new ArrayList<>();
     private StringBuilder sb = new StringBuilder();
 
     private HtmlHelper(Context context, boolean reply) {
@@ -61,28 +62,36 @@ public class HtmlHelper implements NodeVisitor {
         if (StringUtil.in(name, "br", "dd", "dt", "p", "h1", "h2", "h3", "h4", "h5", "div"))
             sb.append(newline);
         else if (name.equals("a")) {
-            String link = node.absUrl("href");
-            if (!TextUtils.isEmpty(link)) {
-                if (!links.contains(link))
-                    links.add(link);
-                sb.append(" ").append(context.getString(R.string.title_link, link, links.size()));
+            String ref = node.absUrl("href");
+            if (!TextUtils.isEmpty(ref)) {
+                if (!refs.contains(ref))
+                    refs.add(ref);
+                String alt = node.attr("alt");
+                if (TextUtils.isEmpty(alt))
+                    alt = context.getString(R.string.title_link);
+                alt = Html.escapeHtml(alt);
+                sb.append(" ").append(String.format("<a href=\"%s\">%s [%d]</a>", ref, alt, refs.size()));
             }
         } else if (name.equals("img")) {
-            String link = node.absUrl("src");
-            if (!TextUtils.isEmpty(link)) {
-                if (!links.contains(link))
-                    links.add(link);
-                sb.append(" ").append(context.getString(R.string.title_image, link, links.size()));
+            String ref = node.absUrl("src");
+            if (!TextUtils.isEmpty(ref)) {
+                if (!refs.contains(ref))
+                    refs.add(ref);
+                String alt = node.attr("alt");
+                if (TextUtils.isEmpty(alt))
+                    alt = context.getString(R.string.title_image);
+                alt = Html.escapeHtml(alt);
+                sb.append(" ").append(String.format("<a href=\"%s\">%s [%d]</a>", ref, alt, refs.size()));
             }
         }
     }
 
     @Override
     public String toString() {
-        if (links.size() > 0)
+        if (refs.size() > 0)
             sb.append(newline).append(newline);
-        for (int i = 0; i < links.size(); i++)
-            sb.append(String.format("[%d] %s ", i + 1, links.get(i))).append(newline);
+        for (int i = 0; i < refs.size(); i++)
+            sb.append(String.format("[%d] %s ", i + 1, refs.get(i))).append(newline);
         return sb.toString();
     }
 
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2f8be0c6df..2d8229cad1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,93 +3,102 @@
 <resources>
   <string name="app_name">Safe email</string>
   <string name="channel_service">Service</string>
-  <string name="channel_error">Errors</string>
+  <string name="channel_error">Fehler</string>
   <string name="title_synchronizing">Synchronizing %1$d account(s)</string>
   <string name="title_operations">%1$d operation(s) pending</string>
   <string name="title_failed">\'%1$s\' failed</string>
-  <string name="menu_unified">Unified inbox</string>
-  <string name="menu_folders">Folders</string>
-  <string name="menu_accounts">Accounts</string>
-  <string name="menu_identities">Identities</string>
-  <string name="menu_theme">Dark theme</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
-  <string name="title_edit_account">Edit account</string>
+  <string name="menu_unified">Gemeinsamer Posteingang</string>
+  <string name="menu_folders">Ordner</string>
+  <string name="menu_accounts">Konten</string>
+  <string name="menu_identities">Identitäten</string>
+  <string name="menu_theme">Dunkles Thema</string>
+  <string name="menu_setup">Einstellungen</string>
+  <string name="menu_debug">Debuginformationen</string>
+  <string name="title_agree">Ich stimme zu</string>
+  <string name="title_disagree">Ich stimme nicht zu</string>
+  <string name="title_list_accounts">Konten</string>
+  <string name="title_list_identities">Identitäten</string>
+  <string name="title_list_folders">Ordner</string>
+  <string name="title_edit_account">Konto bearbeiten</string>
   <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_account">Configure account</string>
-  <string name="title_setup_indentity">Configure identity</string>
-  <string name="title_setup_permissions">Grant permissions</string>
+  <string name="title_edit_folder">Ordner bearbeiten</string>
+  <string name="title_setup">Einstellungen</string>
+  <string name="title_setup_account">Konto einrichten</string>
+  <string name="title_setup_indentity">Identität einrichten</string>
+  <string name="title_setup_permissions">Berechtigungen erteilen</string>
   <string name="title_setup_account_remark">To receive email</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_permissions_remark">To read contacts (optional)</string>
-  <string name="title_setup_done">Done</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_account_name">Account name</string>
+  <string name="title_setup_permissions_remark">Um Kontakte zu lesen (optional)</string>
+  <string name="title_setup_done">Fertig</string>
+  <string name="title_name">Ihr Name</string>
+  <string name="title_email">Ihre E-Mail Adresse</string>
+  <string name="title_reply_to">Antwortadresse</string>
+  <string name="title_optional">Optional</string>
+  <string name="title_account_name">Kontobezeichnung</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
+  <string name="title_provider">Anbieter</string>
+  <string name="title_custom">Benutzerdefiniert</string>
   <string name="title_host">Host name</string>
   <string name="title_starttls">STARTTLS</string>
   <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
+  <string name="title_user">Benutzername</string>
+  <string name="title_password">Passwort</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
-  <string name="title_no_name">Name mandatory</string>
-  <string name="title_no_email">Email address mandatory</string>
-  <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_no_name">Name erforderlich</string>
+  <string name="title_no_email">E-Mail Adresse erforderlich</string>
+  <string name="title_no_idle">IDLE wird nicht unterstützt</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
-  <string name="title_folder_unified">Unified inbox</string>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_unified">Gemeinsamer Posteingang</string>
+  <string name="title_folder_inbox">Posteingang</string>
+  <string name="title_folder_outbox">Postausgang</string>
+  <string name="title_folder_all">Archive</string>
+  <string name="title_folder_drafts">Entwürfe</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
+  <string name="title_folder_sent">Gesendet</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
-  <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_no_messages">Keine E-Mails</string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_move">Move</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_delete">Delete</string>
+  <string name="title_thread">Verlauf</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
+  <string name="title_move">Verschieben</string>
+  <string name="title_forward">Weiterleiten</string>
+  <string name="title_reply_all">Antworten an alle</string>
+  <string name="title_delete">Löschen</string>
   <string name="title_spam">Spam</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
+  <string name="title_archive">Archivieren</string>
+  <string name="title_reply">Antworten</string>
+  <string name="title_ask_delete">E-Mail dauerhaft löschen?</string>
   <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_no_archive">This account has no archive folder</string>
-  <string name="title_no_spam">This account has no spam folder</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
+  <string name="title_no_archive">Dieses Konto hat keinen Archivordner</string>
+  <string name="title_no_spam">Dieses Konto hat keinen Spamordner</string>
+  <string name="title_compose">Verfassen</string>
+  <string name="title_from">Von:</string>
+  <string name="title_to">An:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
+  <string name="title_subject">Betreff:</string>
+  <string name="title_body_hint">Ihre Nachricht</string>
+  <string name="title_save">Speichern</string>
+  <string name="title_send">Senden</string>
   <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
-  <string name="title_draft_deleted">Draft deleted</string>
-  <string name="title_draft_saved">Draft saved</string>
+  <string name="title_from_missing">Absender fehlt</string>
+  <string name="title_to_missing">Empfänger fehlt</string>
+  <string name="title_draft_deleted">Entwurf gelöscht</string>
+  <string name="title_draft_saved">Entwurf gespeichert</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 2f8be0c6df..52960c4227 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2,94 +2,103 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="app_name">Safe email</string>
-  <string name="channel_service">Service</string>
-  <string name="channel_error">Errors</string>
-  <string name="title_synchronizing">Synchronizing %1$d account(s)</string>
-  <string name="title_operations">%1$d operation(s) pending</string>
-  <string name="title_failed">\'%1$s\' failed</string>
-  <string name="menu_unified">Unified inbox</string>
-  <string name="menu_folders">Folders</string>
-  <string name="menu_accounts">Accounts</string>
-  <string name="menu_identities">Identities</string>
-  <string name="menu_theme">Dark theme</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_list_folders">Folders</string>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_account">Configure account</string>
-  <string name="title_setup_indentity">Configure identity</string>
-  <string name="title_setup_permissions">Grant permissions</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_permissions_remark">To read contacts (optional)</string>
-  <string name="title_setup_done">Done</string>
-  <string name="title_name">Your name</string>
-  <string name="title_email">Your email address</string>
-  <string name="title_account_name">Account name</string>
-  <string name="title_account_name_hint">optional</string>
+  <string name="channel_service">Serviciu</string>
+  <string name="channel_error">Erori</string>
+  <string name="title_synchronizing">Sincronizare %1$d cont(uri)</string>
+  <string name="title_operations">%1$d operații în așteptare</string>
+  <string name="title_failed">\'%1$s\' a eșuat</string>
+  <string name="menu_unified">Căsuță poștală comună</string>
+  <string name="menu_folders">Dosare</string>
+  <string name="menu_accounts">Conturi</string>
+  <string name="menu_identities">Identități</string>
+  <string name="menu_theme">Temă întunecată</string>
+  <string name="menu_setup">Setări</string>
+  <string name="menu_debug">Depanare</string>
+  <string name="title_agree">Sunt de acord</string>
+  <string name="title_disagree">Nu sunt de acord</string>
+  <string name="title_list_accounts">Conturi</string>
+  <string name="title_list_identities">Identități</string>
+  <string name="title_list_folders">Dosare</string>
+  <string name="title_edit_account">Editare cont</string>
+  <string name="title_edit_identity">Editare identitate</string>
+  <string name="title_edit_folder">Editare dosar</string>
+  <string name="title_setup">Setări</string>
+  <string name="title_setup_account">Configurare cont</string>
+  <string name="title_setup_indentity">Configurare identitate</string>
+  <string name="title_setup_permissions">Acordă permisiuni</string>
+  <string name="title_setup_account_remark">Pentru a primi e-mail</string>
+  <string name="title_setup_identity_remark">Pentru a trimite e-mail</string>
+  <string name="title_setup_permissions_remark">Pentru a citi contactele (opțional)</string>
+  <string name="title_setup_done">Gata</string>
+  <string name="title_name">Numele dumneavoastră</string>
+  <string name="title_email">Adresa dvs. de e-mail</string>
+  <string name="title_reply_to">Răspuns la adresa</string>
+  <string name="title_optional">Opțional</string>
+  <string name="title_account_name">Nume cont</string>
+  <string name="title_account_name_hint">opțional</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
-  <string name="title_host">Host name</string>
+  <string name="title_provider">Furnizor</string>
+  <string name="title_custom">Personalizat</string>
+  <string name="title_host">Nume gazdă</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
-  <string name="title_synchronize_account">Synchronize (receive messages)</string>
-  <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
-  <string name="title_primary_identity">Primary (default identity)</string>
-  <string name="title_no_name">Name mandatory</string>
-  <string name="title_no_email">Email address mandatory</string>
-  <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_port">Număr port</string>
+  <string name="title_user">Nume utilizator</string>
+  <string name="title_password">Parolă</string>
+  <string name="title_synchronize_account">Sincronizare (primire mesaje)</string>
+  <string name="title_synchronize_identity">Sincronizare (trimitere mesaje)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
+  <string name="title_primary_identity">Primară (identitatea implicită)</string>
+  <string name="title_no_name">Numele este obligatoriu</string>
+  <string name="title_no_email">Adresa de e-mail este obligatorie</string>
+  <string name="title_no_idle">IDLE nu este suportat</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
-  <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-  <string name="title_after">Synchronize (days)</string>
-  <string name="title_folder_unified">Unified inbox</string>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_sent">Sent</string>
-  <string name="title_folder_thread">Message thread</string>
-  <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
-  <string name="title_subject_reply">Re: %1$s</string>
-  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_move">Move</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_delete">Delete</string>
+  <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
+  <string name="title_after">Sincronizare (zile)</string>
+  <string name="title_folder_unified">Căsuță poștală comună</string>
+  <string name="title_folder_inbox">Mesaje primite</string>
+  <string name="title_folder_outbox">Mesaje de trimis</string>
+  <string name="title_folder_all">Arhivă</string>
+  <string name="title_folder_drafts">Ciorne</string>
+  <string name="title_folder_trash">Gunoi</string>
+  <string name="title_folder_junk">Spam</string>
+  <string name="title_folder_sent">Trimise</string>
+  <string name="title_folder_user">Utilizator</string>
+  <string name="title_folder_thread">Discuție cu mesaje</string>
+  <string name="title_no_messages">Nici un mesaj</string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
+  <string name="title_subject_reply">Răsp: %1$s</string>
+  <string name="title_subject_forward">Redir: %1$s</string>
+  <string name="title_thread">Discuție</string>
+  <string name="title_seen">Citit</string>
+  <string name="title_unseen">Necitit</string>
+  <string name="title_move">Mută</string>
+  <string name="title_forward">Redirecționează</string>
+  <string name="title_reply_all">Răspunde tuturor</string>
+  <string name="title_delete">Şterge</string>
   <string name="title_spam">Spam</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
-  <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_no_archive">This account has no archive folder</string>
-  <string name="title_no_spam">This account has no spam folder</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
-  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
-  <string name="title_draft_deleted">Draft deleted</string>
-  <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_archive">Arhivă</string>
+  <string name="title_reply">Răspunde</string>
+  <string name="title_ask_delete">Ștergeți definitiv mesajul?</string>
+  <string name="title_ask_spam">Raportați mesajul drept spam?</string>
+  <string name="title_no_archive">Acest cont nu are un folder arhivă</string>
+  <string name="title_no_spam">Acest cont nu are un folder spam</string>
+  <string name="title_compose">Compune</string>
+  <string name="title_from">De la:</string>
+  <string name="title_to">Către:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
+  <string name="title_subject">Subiect:</string>
+  <string name="title_body_hint">Mesajul dumneavoastră</string>
+  <string name="title_save">Salvează</string>
+  <string name="title_send">Trimite</string>
+  <string name="title_no_primary_drafts">Nici un cont principal sau nici un dosar pentru ciorne</string>
+  <string name="title_from_missing">Expeditor lipsă</string>
+  <string name="title_to_missing">Destinatar lipsă</string>
+  <string name="title_draft_deleted">Ciornă ștearsă</string>
+  <string name="title_draft_saved">Ciornă salvată</string>
+  <string name="title_queued">Mesaj pus în coada de așteptare</string>
+  <string name="title_item_edit_hint">Apăsați lung pentru a edita proprietățile</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2f8be0c6df..9286330f66 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -32,6 +32,8 @@
   <string name="title_setup_done">Done</string>
   <string name="title_name">Your name</string>
   <string name="title_email">Your email address</string>
+  <string name="title_reply_to">Reply to address</string>
+  <string name="title_optional">Optional</string>
   <string name="title_account_name">Account name</string>
   <string name="title_account_name_hint">optional</string>
   <string name="title_imap">IMAP</string>
@@ -45,29 +47,33 @@
   <string name="title_password">Password</string>
   <string name="title_synchronize_account">Synchronize (receive messages)</string>
   <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (use to store drafts)</string>
+  <string name="title_primary_account">Primary (used to store drafts)</string>
   <string name="title_primary_identity">Primary (default identity)</string>
   <string name="title_no_name">Name mandatory</string>
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_drafts">No drafts folder</string>
+  <string name="title_local_drafts">Local drafts</string>
   <string name="title_folder_unseen">%1$s (%2$d)</string>
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_after">Synchronize (days)</string>
   <string name="title_folder_unified">Unified inbox</string>
   <string name="title_folder_inbox">Inbox</string>
   <string name="title_folder_outbox">Outbox</string>
+  <string name="title_folder_all">Archive</string>
   <string name="title_folder_drafts">Drafts</string>
+  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_junk">Spam</string>
   <string name="title_folder_sent">Sent</string>
+  <string name="title_folder_user">User</string>
   <string name="title_folder_thread">Message thread</string>
   <string name="title_no_messages">No messages</string>
-  <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-  <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+  <string name="title_link">link</string>
+  <string name="title_image">image</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_seen">Mark seen</string>
-  <string name="title_unseen">Mark unseen</string>
   <string name="title_thread">Thread</string>
+  <string name="title_seen">Read</string>
+  <string name="title_unseen">Unread</string>
   <string name="title_move">Move</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
@@ -82,6 +88,8 @@
   <string name="title_compose">Compose</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
+  <string name="title_cc">CC:</string>
+  <string name="title_bcc">BCC:</string>
   <string name="title_subject">Subject:</string>
   <string name="title_body_hint">Your message</string>
   <string name="title_save">Save</string>
@@ -92,4 +100,5 @@
   <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Message queued</string>
+  <string name="title_item_edit_hint">Long press item to edit properties</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 449ba8b783..e9aa9d30f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -77,8 +77,8 @@
     <string name="title_folder_thread">Message thread</string>
     <string name="title_no_messages">No messages</string>
 
-    <string name="title_link"><![CDATA[<a href="%1$s">link [%2$d]</a>]]></string>
-    <string name="title_image"><![CDATA[<a href="%1$s">image [%2$d]</a>]]></string>
+    <string name="title_link">link</string>
+    <string name="title_image">image</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>