diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 01ac7b24..359bae0e 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index ddb2dd79..d13c5ef1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 8
-        versionName "0.8"
+        versionCode 9
+        versionName "0.9"
         archivesBaseName = "SafeEmail-v$versionName"
 
         javaCompileOptions {
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 176a5ef0..3dc88cf3 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -102,6 +102,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 176a5ef0..3dc88cf3 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -102,6 +102,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 176a5ef0..3dc88cf3 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -102,6 +102,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 176a5ef0..3dc88cf3 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -102,6 +102,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 176a5ef0..3dc88cf3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -102,6 +102,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bb0588f6..4d711efb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 530802dd..3429325f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Verlauf</string>
   <string name="title_seen">Gelesen</string>
   <string name="title_unseen">Ungelesen</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Weiterleiten</string>
   <string name="title_reply_all">Antworten an alle</string>
   <string name="title_trash">Papierkorb</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f1796c4a..5c009c5d 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f1796c4a..5c009c5d 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 96ef841c..c9b3db69 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -87,6 +87,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 96ef841c..c9b3db69 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -87,6 +87,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bb0588f6..4d711efb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index aa8368d5..fbc35b68 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Tópico</string>
   <string name="title_seen">Lida</string>
   <string name="title_unseen">Não lida</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Encaminhar</string>
   <string name="title_reply_all">Responder a todos</string>
   <string name="title_trash">Lixeira</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 5ea193ed..60b2b734 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -93,6 +93,7 @@
   <string name="title_thread">Discuție</string>
   <string name="title_seen">Citit</string>
   <string name="title_unseen">Necitit</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Redirecționează</string>
   <string name="title_reply_all">Răspunde tuturor</string>
   <string name="title_trash">Gunoi</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bb0588f6..4d711efb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0a0923f0..c2889bbb 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -93,6 +93,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 85e6a6d4..ddf6b7ca 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -90,6 +90,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index bb0588f6..4d711efb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -96,6 +96,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 96ef841c..c9b3db69 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -87,6 +87,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 96ef841c..c9b3db69 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -87,6 +87,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 96ef841c..c9b3db69 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -87,6 +87,7 @@
   <string name="title_thread">Thread</string>
   <string name="title_seen">Read</string>
   <string name="title_unseen">Unread</string>
+  <string name="title_edit">Edit</string>
   <string name="title_forward">Forward</string>
   <string name="title_reply_all">Reply to all</string>
   <string name="title_trash">Trash</string>