diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 9d053c18..f488d3c7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -53,9 +53,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         TextView tvName;
         TextView tvAfter;
         ImageView ivSync;
-        TextView tvCount;
-        TextView tvType;
         TextView tvAccount;
+        TextView tvType;
 
         ViewHolder(View itemView) {
             super(itemView);
@@ -64,9 +63,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             tvName = itemView.findViewById(R.id.tvName);
             tvAfter = itemView.findViewById(R.id.tvAfter);
             ivSync = itemView.findViewById(R.id.ivSync);
-            tvCount = itemView.findViewById(R.id.tvCount);
-            tvType = itemView.findViewById(R.id.tvType);
             tvAccount = itemView.findViewById(R.id.tvAccount);
+            tvType = itemView.findViewById(R.id.tvType);
         }
 
         private void wire() {
@@ -125,7 +123,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         Collections.sort(folders, new Comparator<TupleFolderEx>() {
             @Override
             public int compare(TupleFolderEx f1, TupleFolderEx f2) {
-                int s = EntityFolder.isUser(f1.type).compareTo(EntityFolder.isUser(f2.type));
+                int s = ((Integer) EntityFolder.FOLDER_SORT_ORDER.indexOf(f1.type))
+                        .compareTo(EntityFolder.FOLDER_SORT_ORDER.indexOf(f2.type));
                 if (s == 0) {
                     int a = collator.compare(
                             f1.accountName == null ? "" : f1.accountName,
@@ -228,10 +227,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         TupleFolderEx folder = filtered.get(position);
 
         String name = Helper.localizeFolderName(context, folder.name);
-        if (folder.unseen > 0)
-            holder.tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
-        else
-            holder.tvName.setText(name);
+        holder.tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen, folder.messages));
         holder.tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
         holder.tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary));
 
@@ -239,7 +235,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         holder.tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
 
         holder.ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
-        holder.tvCount.setText(Integer.toString(folder.messages));
+
+        holder.tvAccount.setText(folder.accountName);
+        holder.tvAccount.setVisibility(EntityFolder.TYPE_OUTBOX.equals(folder.type) ? View.GONE : View.VISIBLE);
 
         int resid = context.getResources().getIdentifier(
                 "title_folder_" + folder.type.toLowerCase(),
@@ -247,8 +245,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 context.getPackageName());
         holder.tvType.setText(resid > 0 ? context.getString(resid) : folder.type);
 
-        holder.tvAccount.setText(folder.accountName);
-
         holder.wire();
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 785b8a26..e4fd773c 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -69,14 +69,21 @@ public class EntityFolder {
             TYPE_SENT
     ); // Must match SYSTEM_FOLDER_ATTR
 
+    static final List<String> FOLDER_SORT_ORDER = Arrays.asList(
+            TYPE_INBOX,
+            TYPE_OUTBOX,
+            TYPE_DRAFTS,
+            TYPE_SENT,
+            TYPE_ARCHIVE,
+            TYPE_JUNK,
+            TYPE_TRASH,
+            TYPE_USER
+    );
+
     static boolean isOutgoing(String type) {
         return (TYPE_OUTBOX.equals(type) || TYPE_DRAFTS.equals(type) || TYPE_SENT.equals(type));
     }
 
-    static Boolean isUser(String type) {
-        return TYPE_USER.equals(type);
-    }
-
     @PrimaryKey(autoGenerate = true)
     public Long id;
     public Long account; // Outbox = null
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index e3b6d423..f5b34bf6 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -11,6 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:ellipsize="start"
         android:text="Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintBottom_toBottomOf="@+id/ivSync"
@@ -38,36 +39,26 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tvType"
+        android:id="@+id/tvAccount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
-        android:text="type"
+        android:text="account"
         android:textAppearance="@android:style/TextAppearance.Small"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ivSync" />
 
     <TextView
-        android:id="@+id/tvCount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:text="23"
-        android:textAppearance="@android:style/TextAppearance.Small"
-        app:layout_constraintStart_toEndOf="@id/tvType"
-        app:layout_constraintTop_toBottomOf="@id/ivSync" />
-
-    <TextView
-        android:id="@+id/tvAccount"
+        android:id="@+id/tvType"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
-        android:text="account"
+        android:text="type"
         android:textAlignment="textEnd"
         android:textAppearance="@android:style/TextAppearance.Small"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvType"
+        app:layout_constraintStart_toEndOf="@id/tvAccount"
         app:layout_constraintTop_toBottomOf="@id/ivSync" />
 
     <View
@@ -77,5 +68,5 @@
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvAccount" />
+        app:layout_constraintTop_toBottomOf="@id/tvType" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e27f7d96..c3fd635a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
-  <string name="channel_service">Service</string>
-  <string name="channel_notification">Notifications</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="channel_service">Dienst</string>
+  <string name="channel_notification">Benachrichtigungen</string>
   <string name="channel_error">Fehler</string>
-  <string name="title_notification_synchronizing">Synchronizing %1$d account(s)</string>
+  <string name="title_notification_synchronizing">Synchronisiere %1$d Konto/-en</string>
   <string name="title_notification_operations">%1$d operation(s) pending</string>
-  <string name="title_notification_unseen">%1$d new message(s)</string>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
+  <string name="title_notification_unseen">%1$d neue Nachricht(en)</string>
+  <string name="title_notification_failed">\'%1$s\' fehlgeschlagen</string>
   <string name="menu_folders">Ordner</string>
   <string name="menu_setup">Einstellungen</string>
-  <string name="menu_debug">Debuginformationen</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">Ich stimme zu</string>
   <string name="title_disagree">Ich stimme nicht zu</string>
+  <string name="title_version">Version %1$s</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_identity">Identität bearbeiten</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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Identität einrichten</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Berechtigungen erteilen</string>
   <string name="title_setup_permissions_remark">Um Kontakte zu lesen (optional)</string>
   <string name="title_setup_done">Fertig</string>
-  <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_dark_theme">Dunkles Thema</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Anbieter</string>
@@ -46,38 +46,38 @@
   <string name="title_port">Port number</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_synchronize_account">Synchronisiere (empfange E-Mails)</string>
+  <string name="title_synchronize_identity">Synchronisiere (sende E-Mails)</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 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_local_drafts">Lokale Entwürfe</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$d)</string>
+  <string name="title_synchronize_folder">Synchronisiere (empfange E-Mails)</string>
+  <string name="title_after">Synchronisiere (Tage)</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_all">Archiv</string>
   <string name="title_folder_drafts">Entwürfe</string>
-  <string name="title_folder_trash">Trash</string>
+  <string name="title_folder_trash">Papierkorb</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_user">Benutzer</string>
   <string name="title_folder_thread">Message thread</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_link">Link</string>
+  <string name="title_image">Bild</string>
   <string name="title_subject_reply">Re: %1$s</string>
   <string name="title_subject_forward">Fwd: %1$s</string>
   <string name="title_thread">Verlauf</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
+  <string name="title_seen">Gelesen</string>
+  <string name="title_unseen">Ungelesen</string>
   <string name="title_forward">Weiterleiten</string>
   <string name="title_reply_all">Antworten an alle</string>
-  <string name="title_trash">Trash</string>
+  <string name="title_trash">Papierkorb</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Verschieben</string>
   <string name="title_archive">Archivieren</string>
@@ -97,9 +97,10 @@
   <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
   <string name="title_from_missing">Absender fehlt</string>
   <string name="title_to_missing">Empfänger fehlt</string>
-  <string name="title_draft_trashed">Draft trashed</string>
+  <string name="title_draft_trashed">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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 6f5dcfc0..81f4f2a5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Serviciu</string>
-  <string name="channel_notification">Notifications</string>
+  <string name="channel_notification">Notificări</string>
   <string name="channel_error">Erori</string>
-  <string name="title_notification_synchronizing">Synchronizing %1$d account(s)</string>
-  <string name="title_notification_operations">%1$d operation(s) pending</string>
-  <string name="title_notification_unseen">%1$d new message(s)</string>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
+  <string name="title_notification_synchronizing">Sincronizare %1$d cont(uri)</string>
+  <string name="title_notification_operations">%1$d operații în așteptare</string>
+  <string name="title_notification_unseen">%1$d mesaje noi</string>
+  <string name="title_notification_failed">\'%1$s\' a eșuat</string>
   <string name="menu_folders">Dosare</string>
   <string name="menu_setup">Setări</string>
-  <string name="menu_debug">Depanare</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">Sunt de acord</string>
   <string name="title_disagree">Nu sunt de acord</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Conturi</string>
   <string name="title_list_identities">Identități</string>
   <string name="title_list_folders">Dosare</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">Pentru a primi e-mail</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configurare identitate</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">Pentru a trimite e-mail</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Acordă permisiuni</string>
   <string name="title_setup_permissions_remark">Pentru a citi contactele (opțional)</string>
   <string name="title_setup_done">Gata</string>
-  <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_dark_theme">Temă întunecată</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Furnizor</string>
@@ -54,7 +54,7 @@
   <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">Ciorne locale</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$d)</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>
@@ -77,12 +77,12 @@
   <string name="title_unseen">Necitit</string>
   <string name="title_forward">Redirecționează</string>
   <string name="title_reply_all">Răspunde tuturor</string>
-  <string name="title_trash">Trash</string>
+  <string name="title_trash">Gunoi</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Mută</string>
   <string name="title_archive">Arhivă</string>
   <string name="title_reply">Răspunde</string>
-  <string name="title_no_viewer">No viewer app available</string>
+  <string name="title_no_viewer">Nici o aplicație nu poate deschide</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_compose">Compune</string>
@@ -97,9 +97,10 @@
   <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_trashed">Draft trashed</string>
+  <string name="title_draft_trashed">Ciornă trimisă la gunoi</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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e1777058..b0338628 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</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 e1777058..b0338628 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_name">Safe email</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>
@@ -11,9 +11,10 @@
   <string name="title_notification_failed">\'%1$s\' failed</string>
   <string name="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
-  <string name="menu_debug">Debug info</string>
+  <string name="menu_about">About</string>
   <string name="title_agree">I agree</string>
   <string name="title_disagree">I disagree</string>
+  <string name="title_version">Version %1$s</string>
   <string name="title_list_accounts">Accounts</string>
   <string name="title_list_identities">Identities</string>
   <string name="title_list_folders">Folders</string>
@@ -21,22 +22,21 @@
   <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_account">Manage accounts</string>
   <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_account_manage">Manage accounts</string>
-  <string name="title_setup_indentity">Configure identity</string>
+  <string name="title_setup_identity">Manage identities</string>
   <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_identity_manage">Manage identities</string>
   <string name="title_setup_permissions">Grant permissions</string>
   <string name="title_setup_permissions_remark">To read contacts (optional)</string>
   <string name="title_setup_done">Done</string>
   <string name="title_setup_dark_theme">Dark theme</string>
+  <string name="title_setup_debug">Debug</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_account_name_hint">Used to differentiate folders</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -54,7 +54,7 @@
   <string name="title_no_email">Email address mandatory</string>
   <string name="title_no_idle">IDLE not supported</string>
   <string name="title_local_drafts">Local drafts</string>
-  <string name="title_folder_unseen">%1$s (%2$d)</string>
+  <string name="title_folder_unseen">%1$s (%2$d/%3$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>
@@ -101,5 +101,6 @@
   <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>
-  <string name="title_debug_info">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_debug_info">Debug info</string>
+  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12fc71f4..9fd78777 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,7 @@
     <string name="title_no_idle">IDLE not supported</string>
     <string name="title_local_drafts">Local drafts</string>
 
-    <string name="title_folder_unseen">%1$s (%2$d)</string>
+    <string name="title_folder_unseen">%1$s (%2$d/%3$d)</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_after">Synchronize (days)</string>