diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1fc00737de..b18d528bba 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -135,8 +135,6 @@ public class FragmentCompose extends FragmentEx {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setSubtitle(R.string.title_compose);
-
         view = (ViewGroup) inflater.inflate(R.layout.fragment_compose, container, false);
 
         // Get controls
@@ -955,9 +953,10 @@ public class FragmentCompose extends FragmentEx {
         return attachment;
     }
 
-    private SimpleTask<EntityMessage> draftLoader = new SimpleTask<EntityMessage>() {
+    private SimpleTask<DraftAccount> draftLoader = new SimpleTask<DraftAccount>() {
+
         @Override
-        protected EntityMessage onLoad(Context context, Bundle args) throws IOException {
+        protected DraftAccount onLoad(Context context, Bundle args) throws IOException {
             String action = args.getString("action");
             long id = args.getLong("id", -1);
             long reference = args.getLong("reference", -1);
@@ -966,31 +965,32 @@ public class FragmentCompose extends FragmentEx {
 
             Log.i(Helper.TAG, "Load draft action=" + action + " id=" + id + " reference=" + reference);
 
-            EntityMessage draft;
+            DraftAccount result = new DraftAccount();
 
             DB db = DB.getInstance(context);
             try {
                 db.beginTransaction();
 
-                draft = db.message().getMessage(id);
-                if (draft == null || draft.ui_hide) {
+                result.draft = db.message().getMessage(id);
+                if (result.draft == null || result.draft.ui_hide) {
                     if ("edit".equals(action))
                         throw new IllegalStateException("Message to edit not found");
-                } else
-                    return draft;
+                } else {
+                    result.account = db.account().getAccount(result.draft.account);
+                    return result;
+                }
 
-                EntityAccount account;
                 EntityMessage ref = db.message().getMessage(reference);
                 if (ref == null) {
                     long aid = args.getLong("account", -1);
                     if (aid < 0) {
-                        account = db.account().getPrimaryAccount();
-                        if (account == null)
+                        result.account = db.account().getPrimaryAccount();
+                        if (result.account == null)
                             throw new IllegalArgumentException(context.getString(R.string.title_no_account));
                     } else
-                        account = db.account().getAccount(aid);
+                        result.account = db.account().getAccount(aid);
                 } else {
-                    account = db.account().getAccount(ref.account);
+                    result.account = db.account().getAccount(ref.account);
 
                     // Reply to recipient, not to known self
                     List<EntityIdentity> identities = db.identity().getIdentities();
@@ -1032,7 +1032,7 @@ public class FragmentCompose extends FragmentEx {
                 }
 
                 EntityFolder drafts;
-                drafts = db.folder().getFolderByType(account.id, EntityFolder.DRAFTS);
+                drafts = db.folder().getFolderByType(result.account.id, EntityFolder.DRAFTS);
                 if (drafts == null)
                     drafts = db.folder().getPrimaryDrafts();
                 if (drafts == null)
@@ -1040,51 +1040,51 @@ public class FragmentCompose extends FragmentEx {
 
                 String body = "";
 
-                draft = new EntityMessage();
-                draft.account = account.id;
-                draft.folder = drafts.id;
-                draft.msgid = EntityMessage.generateMessageId();
+                result.draft = new EntityMessage();
+                result.draft.account = result.account.id;
+                result.draft.folder = drafts.id;
+                result.draft.msgid = EntityMessage.generateMessageId();
 
                 if (ref == null) {
-                    draft.thread = draft.msgid;
+                    result.draft.thread = result.draft.msgid;
 
                     try {
                         String to = args.getString("to");
-                        draft.to = (TextUtils.isEmpty(to) ? null : InternetAddress.parse(to));
+                        result.draft.to = (TextUtils.isEmpty(to) ? null : InternetAddress.parse(to));
                     } catch (AddressException ex) {
                         Log.w(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                     }
 
                     try {
                         String cc = args.getString("cc");
-                        draft.cc = (TextUtils.isEmpty(cc) ? null : InternetAddress.parse(cc));
+                        result.draft.cc = (TextUtils.isEmpty(cc) ? null : InternetAddress.parse(cc));
                     } catch (AddressException ex) {
                         Log.w(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                     }
 
                     try {
                         String bcc = args.getString("bcc");
-                        draft.bcc = (TextUtils.isEmpty(bcc) ? null : InternetAddress.parse(bcc));
+                        result.draft.bcc = (TextUtils.isEmpty(bcc) ? null : InternetAddress.parse(bcc));
                     } catch (AddressException ex) {
                         Log.w(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                     }
 
-                    draft.subject = args.getString("subject");
+                    result.draft.subject = args.getString("subject");
                     body = args.getString("body");
                     if (body == null)
                         body = "";
                     else
                         body = body.replaceAll("\\r?\\n", "<br />");
 
-                    if (pro && !TextUtils.isEmpty(account.signature))
-                        body += account.signature;
+                    if (pro && !TextUtils.isEmpty(result.account.signature))
+                        body += result.account.signature;
                 } else {
-                    draft.thread = ref.thread;
+                    result.draft.thread = ref.thread;
 
                     if ("reply".equals(action) || "reply_all".equals(action)) {
-                        draft.replying = ref.id;
-                        draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
-                        draft.from = ref.to;
+                        result.draft.replying = ref.id;
+                        result.draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
+                        result.draft.from = ref.to;
 
                         if ("reply_all".equals(action)) {
                             List<Address> addresses = new ArrayList<>();
@@ -1101,41 +1101,41 @@ public class FragmentCompose extends FragmentEx {
                                         addresses.remove(address);
                                 }
                             }
-                            draft.cc = addresses.toArray(new Address[0]);
+                            result.draft.cc = addresses.toArray(new Address[0]);
                         }
 
                     } else if ("forward".equals(action)) {
                         //msg.replying = ref.id;
-                        draft.from = ref.to;
+                        result.draft.from = ref.to;
                     }
 
                     long time = (ref.sent == null ? ref.received : ref.sent);
 
                     if ("reply".equals(action) || "reply_all".equals(action)) {
-                        draft.subject = context.getString(R.string.title_subject_reply, ref.subject);
+                        result.draft.subject = context.getString(R.string.title_subject_reply, ref.subject);
                         body = String.format("<p>%s %s:</p><blockquote>%s</blockquote>",
                                 Html.escapeHtml(new Date(time).toString()),
-                                Html.escapeHtml(MessageHelper.getFormattedAddresses(draft.to, true)),
+                                Html.escapeHtml(MessageHelper.getFormattedAddresses(result.draft.to, true)),
                                 HtmlHelper.sanitize(ref.read(context)));
                     } else if ("forward".equals(action)) {
-                        draft.subject = context.getString(R.string.title_subject_forward, ref.subject);
+                        result.draft.subject = context.getString(R.string.title_subject_forward, ref.subject);
                         body = String.format("<p>%s %s:</p><blockquote>%s</blockquote>",
                                 Html.escapeHtml(new Date(time).toString()),
                                 Html.escapeHtml(MessageHelper.getFormattedAddresses(ref.from, true)),
                                 HtmlHelper.sanitize(ref.read(context)));
                     }
 
-                    if (pro && !TextUtils.isEmpty(account.signature))
-                        body = account.signature + body;
+                    if (pro && !TextUtils.isEmpty(result.account.signature))
+                        body = result.account.signature + body;
 
                     if (answer > 0 && ("reply".equals(action) || "reply_all".equals(action))) {
                         String text = db.answer().getAnswer(answer).text;
 
                         String name = null;
                         String email = null;
-                        if (draft.to != null && draft.to.length > 0) {
-                            name = ((InternetAddress) draft.to[0]).getPersonal();
-                            email = ((InternetAddress) draft.to[0]).getAddress();
+                        if (result.draft.to != null && result.draft.to.length > 0) {
+                            name = ((InternetAddress) result.draft.to[0]).getPersonal();
+                            email = ((InternetAddress) result.draft.to[0]).getAddress();
                         }
                         text = text.replace("$name$", name == null ? "" : name);
                         text = text.replace("$email$", email == null ? "" : email);
@@ -1145,31 +1145,31 @@ public class FragmentCompose extends FragmentEx {
                         body = "<br><br>" + body;
                 }
 
-                draft.content = true;
-                draft.received = new Date().getTime();
-                draft.seen = false;
-                draft.ui_seen = false;
-                draft.flagged = false;
-                draft.ui_flagged = false;
-                draft.ui_hide = false;
-                draft.ui_found = false;
-                draft.ui_ignored = false;
+                result.draft.content = true;
+                result.draft.received = new Date().getTime();
+                result.draft.seen = false;
+                result.draft.ui_seen = false;
+                result.draft.flagged = false;
+                result.draft.ui_flagged = false;
+                result.draft.ui_hide = false;
+                result.draft.ui_found = false;
+                result.draft.ui_ignored = false;
 
-                draft.id = db.message().insertMessage(draft);
-                draft.write(context, body == null ? "" : body);
+                result.draft.id = db.message().insertMessage(result.draft);
+                result.draft.write(context, body == null ? "" : body);
 
                 if ("new".equals(action)) {
                     ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
                     if (uris != null)
                         for (Uri uri : uris)
-                            addAttachment(context, draft.id, uri, false);
+                            addAttachment(context, result.draft.id, uri, false);
                 } else if ("forward".equals(action)) {
                     int sequence = 0;
                     List<EntityAttachment> attachments = db.attachment().getAttachments(ref.id);
                     for (EntityAttachment attachment : attachments)
                         if (attachment.available) {
                             EntityAttachment copy = new EntityAttachment();
-                            copy.message = draft.id;
+                            copy.message = result.draft.id;
                             copy.sequence = ++sequence;
                             copy.name = attachment.name;
                             copy.type = attachment.type;
@@ -1185,7 +1185,7 @@ public class FragmentCompose extends FragmentEx {
                         }
                 }
 
-                EntityOperation.queue(db, draft, EntityOperation.ADD);
+                EntityOperation.queue(db, result.draft, EntityOperation.ADD);
 
                 db.setTransactionSuccessful();
             } finally {
@@ -1194,26 +1194,28 @@ public class FragmentCompose extends FragmentEx {
 
             EntityOperation.process(context);
 
-            return draft;
+            return result;
         }
 
         @Override
-        protected void onLoaded(Bundle args, final EntityMessage draft) {
-            working = draft.id;
+        protected void onLoaded(Bundle args, final DraftAccount result) {
+            working = result.draft.id;
             autosave = true;
 
             final String action = getArguments().getString("action");
-            Log.i(Helper.TAG, "Loaded draft id=" + draft.id + " action=" + action);
+            Log.i(Helper.TAG, "Loaded draft id=" + result.draft.id + " action=" + action);
+
+            setSubtitle(getString(R.string.title_compose, result.account.name));
 
-            etTo.setText(MessageHelper.getFormattedAddresses(draft.to, true));
-            etCc.setText(MessageHelper.getFormattedAddresses(draft.cc, true));
-            etBcc.setText(MessageHelper.getFormattedAddresses(draft.bcc, true));
-            etSubject.setText(draft.subject);
+            etTo.setText(MessageHelper.getFormattedAddresses(result.draft.to, true));
+            etCc.setText(MessageHelper.getFormattedAddresses(result.draft.cc, true));
+            etBcc.setText(MessageHelper.getFormattedAddresses(result.draft.bcc, true));
+            etSubject.setText(result.draft.subject);
 
             etBody.setText(null);
 
             Bundle a = new Bundle();
-            a.putLong("id", draft.id);
+            a.putLong("id", result.draft.id);
 
             new SimpleTask<Spanned>() {
                 @Override
@@ -1273,9 +1275,9 @@ public class FragmentCompose extends FragmentEx {
                     boolean found = false;
 
                     // Select earlier selected identity
-                    if (draft.identity != null)
+                    if (result.draft.identity != null)
                         for (int pos = 0; pos < identities.size(); pos++) {
-                            if (identities.get(pos).id.equals(draft.identity)) {
+                            if (identities.get(pos).id.equals(result.draft.identity)) {
                                 spFrom.setSelection(pos);
                                 found = true;
                                 break;
@@ -1283,8 +1285,8 @@ public class FragmentCompose extends FragmentEx {
                         }
 
                     // Select identity matching from address
-                    if (!found && draft.from != null && draft.from.length > 0) {
-                        String from = Helper.canonicalAddress(((InternetAddress) draft.from[0]).getAddress());
+                    if (!found && result.draft.from != null && result.draft.from.length > 0) {
+                        String from = Helper.canonicalAddress(((InternetAddress) result.draft.from[0]).getAddress());
                         for (int pos = 0; pos < identities.size(); pos++) {
                             String email = Helper.canonicalAddress(identities.get(pos).email);
                             if (email.equals(from)) {
@@ -1307,8 +1309,8 @@ public class FragmentCompose extends FragmentEx {
                 }
             });
 
-            db.attachment().liveAttachments(draft.id).removeObservers(getViewLifecycleOwner());
-            db.attachment().liveAttachments(draft.id).observe(getViewLifecycleOwner(),
+            db.attachment().liveAttachments(result.draft.id).removeObservers(getViewLifecycleOwner());
+            db.attachment().liveAttachments(result.draft.id).observe(getViewLifecycleOwner(),
                     new Observer<List<EntityAttachment>>() {
                         @Override
                         public void onChanged(@Nullable List<EntityAttachment> attachments) {
@@ -1320,8 +1322,8 @@ public class FragmentCompose extends FragmentEx {
                         }
                     });
 
-            db.message().liveMessage(draft.id).removeObservers(getViewLifecycleOwner());
-            db.message().liveMessage(draft.id).observe(getViewLifecycleOwner(), new Observer<EntityMessage>() {
+            db.message().liveMessage(result.draft.id).removeObservers(getViewLifecycleOwner());
+            db.message().liveMessage(result.draft.id).observe(getViewLifecycleOwner(), new Observer<EntityMessage>() {
                 @Override
                 public void onChanged(final EntityMessage draft) {
                     // Draft was deleted
@@ -1532,6 +1534,11 @@ public class FragmentCompose extends FragmentEx {
         }
     };
 
+    private class DraftAccount {
+        EntityMessage draft;
+        EntityAccount account;
+    }
+
     public class IdentityAdapter extends ArrayAdapter<EntityIdentity> {
         private Context context;
         private List<EntityIdentity> identities;
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 555b863c6c..074f8ed2ce 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -191,7 +191,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">إنشاء</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">من:</string>
   <string name="title_to">إلى:</string>
   <string name="title_reply_to">الرد على:</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 555b863c6c..074f8ed2ce 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -191,7 +191,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">إنشاء</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">من:</string>
   <string name="title_to">إلى:</string>
   <string name="title_reply_to">الرد على:</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 555b863c6c..074f8ed2ce 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -191,7 +191,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">إنشاء</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">من:</string>
   <string name="title_to">إلى:</string>
   <string name="title_reply_to">الرد على:</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 555b863c6c..074f8ed2ce 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -191,7 +191,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">إنشاء</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">من:</string>
   <string name="title_to">إلى:</string>
   <string name="title_reply_to">الرد على:</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 555b863c6c..074f8ed2ce 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -191,7 +191,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">رسالة التقرير كالبريد المزعج؟</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">إنشاء</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">من:</string>
   <string name="title_to">إلى:</string>
   <string name="title_reply_to">الرد على:</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 92f5c6e1b8..0879c14572 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -59,7 +59,7 @@
   <string name="title_setup_data">Verilənlərə qənaət-i ləğv et</string>
   <string name="title_setup_permissions">İcazə ver</string>
   <string name="title_setup_permissions_remark">Şəxs məlumatı alma (istənilən)</string>
-  <string name="title_setup_notifications">Manage notifications</string>
+  <string name="title_setup_notifications">Bildirişləri idarə et</string>
   <string name="title_setup_to_do">Edilməli</string>
   <string name="title_setup_done">Hazırdır</string>
   <string name="title_setup_light_theme">Açıq tema</string>
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Qaralama silinsin?</string>
   <string name="title_ask_spam">Mesajı spam kimi bildirilsin?</string>
   <string name="title_fix">Düzəlt</string>
-  <string name="title_compose">Tərtib et</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Göndərən:</string>
   <string name="title_to">Alıcı:</string>
   <string name="title_reply_to">Cavabla:</string>
@@ -199,9 +199,9 @@
   <string name="title_draft_deleted">Qaralama silindi</string>
   <string name="title_draft_saved">Qaralama saxlanıldı</string>
   <string name="title_queued">Mesaj göndərilir</string>
-  <string name="title_encrypt">Encrypt</string>
-  <string name="title_decrypt">Decrypt</string>
-  <string name="title_no_openpgp">OpenKeychain not found</string>
+  <string name="title_encrypt">Şifrələ</string>
+  <string name="title_decrypt">Şifrəni aç</string>
+  <string name="title_no_openpgp">OpenKeychain tapılmadı</string>
   <string name="title_search">Axtar</string>
   <string name="title_search_hint">Serverdə axtar</string>
   <string name="title_searching">\'%1$s\' axtarılır</string>
@@ -213,8 +213,8 @@
   <string name="title_previous">Əvvəlki</string>
   <string name="title_next">Növbəti</string>
   <string name="title_answer_reply">Cavab şablonu</string>
-  <string name="title_answer_name">Template name</string>
-  <string name="title_answer_text">Template text</string>
+  <string name="title_answer_name">Şablon adı</string>
+  <string name="title_answer_text">Şablon mətni</string>
   <string name="title_legend_inbox">Gələn qutusu</string>
   <string name="title_legend_unified">Birləşmiş gələn qutusu</string>
   <string name="title_legend_archive">Arxiv</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5cdfbc9576..de6fa51d59 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Voleu rebutjar l\'esborrany?</string>
   <string name="title_ask_spam">Qualificar el missatge com correu brossa?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Redactar</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">De:</string>
   <string name="title_to">A:</string>
   <string name="title_reply_to">Respondre a:</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 96b34d2ad3..a36c6b5bd0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index f30d22e07b..7a77ee26d9 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Rapportér meddelelse som spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Ny meddelelse</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Fra:</string>
   <string name="title_to">Til:</string>
   <string name="title_reply_to">Svar til:</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 436ecc8925..14771a8c30 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -59,7 +59,7 @@
   <string name="title_setup_data">Deaktivere Datenreduzierung</string>
   <string name="title_setup_permissions">Berechtigungen erteilen</string>
   <string name="title_setup_permissions_remark">Um Kontaktinformationen zu erhalten (optional)</string>
-  <string name="title_setup_notifications">Manage notifications</string>
+  <string name="title_setup_notifications">Benachrichtigungen verwalten</string>
   <string name="title_setup_to_do">To Do</string>
   <string name="title_setup_done">Erledigt</string>
   <string name="title_setup_light_theme">Helles Thema</string>
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Entwurf verwerfen?</string>
   <string name="title_ask_spam">Nachricht als Spam melden?</string>
   <string name="title_fix">Problem beheben</string>
-  <string name="title_compose">Verfassen</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Von:</string>
   <string name="title_to">An:</string>
   <string name="title_reply_to">Antworten an:</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 066021de6d..b876355001 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">¿Descartar el borrador?</string>
   <string name="title_ask_spam">¿Reportar mensaje como spam?</string>
   <string name="title_fix">Reparar</string>
-  <string name="title_compose">Redactar</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">De:</string>
   <string name="title_to">A:</string>
   <string name="title_reply_to">Responder a:</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b679b46072..63dbf54e3c 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 74f132571b..b9013953ea 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Supprimer le brouillon ?</string>
   <string name="title_ask_spam">Signaler le message comme spam ?</string>
   <string name="title_fix">Corriger</string>
-  <string name="title_compose">Rédiger</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">De :</string>
   <string name="title_to">À :</string>
   <string name="title_reply_to">Répondre à :</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 03da908cb9..f7175cdf16 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 4b68b7187e..d4823c98d7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0c19729ebc..5a28ad096a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Eliminare la bozza?</string>
   <string name="title_ask_spam">Segnalare il messaggio come posta indesiderata?</string>
   <string name="title_fix">Correggi</string>
-  <string name="title_compose">Scrivi</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Da:</string>
   <string name="title_to">A:</string>
   <string name="title_reply_to">Rispondi a:</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 03da908cb9..f7175cdf16 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 89e5f2e249..9ac291bd8b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -171,7 +171,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 89e5f2e249..9ac291bd8b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -171,7 +171,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 06c0283c9a..aa6288e2d7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Concept weggooien?</string>
   <string name="title_ask_spam">Rapporteren als spam?</string>
   <string name="title_fix">Oplossen</string>
-  <string name="title_compose">Opstellen</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Van:</string>
   <string name="title_to">Aan:</string>
   <string name="title_reply_to">Antwoord op:</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7d347397d3..303e9f3b8a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -67,7 +67,7 @@
   <string name="title_setup_data">Wyłącz oszczędzanie danych</string>
   <string name="title_setup_permissions">Przyznaj uprawnienia</string>
   <string name="title_setup_permissions_remark">Aby uzyskać informacje kontaktowe (opcjonalnie)</string>
-  <string name="title_setup_notifications">Manage notifications</string>
+  <string name="title_setup_notifications">Zarządzaj powiadomieniami</string>
   <string name="title_setup_to_do">Do zrobienia</string>
   <string name="title_setup_done">Gotowe</string>
   <string name="title_setup_light_theme">Jasny motyw</string>
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Odrzucić szkic?</string>
   <string name="title_ask_spam">Zgłosić wiadomość jako spam?</string>
   <string name="title_fix">Popraw</string>
-  <string name="title_compose">Napisz</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Od:</string>
   <string name="title_to">Do:</string>
   <string name="title_reply_to">Odpisz do:</string>
@@ -207,9 +207,9 @@
   <string name="title_draft_deleted">Szkic odrzucony</string>
   <string name="title_draft_saved">Szkic zapisany</string>
   <string name="title_queued">Wysyłanie wiadomości</string>
-  <string name="title_encrypt">Encrypt</string>
-  <string name="title_decrypt">Decrypt</string>
-  <string name="title_no_openpgp">OpenKeychain not found</string>
+  <string name="title_encrypt">Zaszyfruj</string>
+  <string name="title_decrypt">Odszyfruj</string>
+  <string name="title_no_openpgp">Nie znaleziono OpenKeychain</string>
   <string name="title_search">Szukaj</string>
   <string name="title_search_hint">Szukaj na serwerze</string>
   <string name="title_searching">Szukam \'%1$s\'</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ada1ffaa82..7c54f55fd4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Reportar mensagem com spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Escrever</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">De:</string>
   <string name="title_to">Para:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index c2e88fa65f..2586fc4689 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 67cf58e02a..f1cda39261 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -179,7 +179,7 @@
   <string name="title_ask_discard">Renunțați la ciornă?</string>
   <string name="title_ask_spam">Raportați mesajul drept spam?</string>
   <string name="title_fix">Remediere</string>
-  <string name="title_compose">Compune</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">De la:</string>
   <string name="title_to">Către:</string>
   <string name="title_reply_to">Răspunde la:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 96b34d2ad3..a36c6b5bd0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 62f2625568..c7088717fa 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -179,7 +179,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index e635181a9b..f7f98fef69 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Släng utkastet?</string>
   <string name="title_ask_spam">Rapportera meddelandet som skräppost?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Skriv</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Från:</string>
   <string name="title_to">Till:</string>
   <string name="title_reply_to">Svara till:</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2c5272439c..42bbd80e23 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -175,7 +175,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">İletiyi spam olarak raporla?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Oluştur</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">Gönderen:</string>
   <string name="title_to">Alıcı:</string>
   <string name="title_reply_to">Yanıt adresi:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 96b34d2ad3..a36c6b5bd0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -183,7 +183,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 89e5f2e249..9ac291bd8b 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -171,7 +171,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6c8d3c0aaa..257f4a1480 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -171,7 +171,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">确定将邮件标为垃圾邮件吗？</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">新邮件</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">发件人：</string>
   <string name="title_to">收件人：</string>
   <string name="title_reply_to">回复：</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 89e5f2e249..9ac291bd8b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -171,7 +171,7 @@
   <string name="title_ask_discard">Discard draft?</string>
   <string name="title_ask_spam">Report message as spam?</string>
   <string name="title_fix">Fix</string>
-  <string name="title_compose">Compose</string>
+  <string name="title_compose">Compose %1$s</string>
   <string name="title_from">From:</string>
   <string name="title_to">To:</string>
   <string name="title_reply_to">Reply to:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e8cf1e8c0..b72e37b1af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -202,7 +202,7 @@
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_fix">Fix</string>
 
-    <string name="title_compose">Compose</string>
+    <string name="title_compose">Compose %1$s</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>