diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 9820ef84..2187a53a 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -38,18 +38,20 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 public class ActivityView extends ActivityBase implements FragmentManager.OnBackStackChangedListener, SharedPreferences.OnSharedPreferenceChangeListener {
     private boolean newIntent = false;
@@ -101,8 +103,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 DrawerItem item = (DrawerItem) parent.getAdapter().getItem(position);
                 switch (item.getId()) {
-                    case R.string.menu_folders:
-                        onMenuFolders();
+                    case -1:
+                        onMenuFolders((long) item.getData());
                         break;
                     case R.string.menu_setup:
                         onMenuSetup();
@@ -115,15 +117,39 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
                         break;
                 }
 
-                if (!item.isCheckable())
-                    drawerLayout.closeDrawer(drawerList);
+                drawerLayout.closeDrawer(drawerList);
             }
         });
 
         PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
         getSupportFragmentManager().addOnBackStackChangedListener(this);
 
-        updateDrawer();
+        DB.getInstance(this).account().liveAccounts().observe(this, new Observer<List<EntityAccount>>() {
+            @Override
+            public void onChanged(@Nullable List<EntityAccount> accounts) {
+                ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(ActivityView.this, R.layout.item_drawer);
+
+                final Collator collator = Collator.getInstance(Locale.getDefault());
+                collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
+
+                Collections.sort(accounts, new Comparator<EntityAccount>() {
+                    @Override
+                    public int compare(EntityAccount a1, EntityAccount a2) {
+                        return collator.compare(a1.name, a2.name);
+                    }
+                });
+
+                for (EntityAccount account : accounts)
+                    drawerArray.add(new DrawerItem(-1, R.drawable.baseline_folder_24, account.name, account.id));
+
+                drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_settings_applications_24, R.string.menu_setup));
+                if (getIntentFAQ().resolveActivity(getPackageManager()) != null)
+                    drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_question_answer_24, R.string.menu_faq));
+                drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_help_24, R.string.menu_about));
+
+                drawerList.setAdapter(drawerArray);
+            }
+        });
 
         if (getSupportFragmentManager().getFragments().size() == 0)
             init();
@@ -216,20 +242,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
             init();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_view, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        menu.findItem(R.id.menu_folders).setVisible(prefs.getBoolean("eula" , false));
-        return super.onPrepareOptionsMenu(menu);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (drawerToggle.onOptionsItemSelected(item))
@@ -239,9 +251,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
             case android.R.id.home:
                 getSupportFragmentManager().popBackStack();
                 return true;
-            case R.id.menu_folders:
-                onMenuFolders();
-                return true;
             default:
                 return false;
         }
@@ -280,26 +289,23 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
         }
     }
 
-    public void updateDrawer() {
-        ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(this, R.layout.item_drawer);
-        drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_setup));
-        if (getIntentFAQ().resolveActivity(getPackageManager()) != null)
-            drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_faq));
-        drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_about));
-        drawerList.setAdapter(drawerArray);
-    }
-
     private Intent getIntentFAQ() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md"));
         return intent;
     }
 
-    private void onMenuFolders() {
+    private void onMenuFolders(long account) {
         getSupportFragmentManager().popBackStack("unified" , 0);
 
+        Bundle args = new Bundle();
+        args.putLong("account" , account);
+
+        FragmentFolders fragment = new FragmentFolders();
+        fragment.setArguments(args);
+
         FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.replace(R.id.content_frame, new FragmentFolders()).addToBackStack("folders");
+        fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folders");
         fragmentTransaction.commit();
     }
 
@@ -319,38 +325,29 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
 
     private class DrawerItem {
         private int id;
+        private int icon;
         private String title;
-        private boolean checkable;
-        private boolean checked;
+        private Object data;
 
-        DrawerItem(Context context, int title) {
+        DrawerItem(Context context, int icon, int title) {
             this.id = title;
+            this.icon = icon;
             this.title = context.getString(title);
-            this.checkable = false;
-            this.checked = false;
         }
 
-        DrawerItem(Context context, int title, boolean checked) {
-            this.id = title;
-            this.title = context.getString(title);
-            this.checkable = true;
-            this.checked = checked;
+        DrawerItem(int id, int icon, String title, Object data) {
+            this.id = id;
+            this.icon = icon;
+            this.title = title;
+            this.data = data;
         }
 
         public int getId() {
             return this.id;
         }
 
-        public String getTitle() {
-            return this.title;
-        }
-
-        public boolean isCheckable() {
-            return this.checkable;
-        }
-
-        public boolean isChecked() {
-            return this.checked;
+        public Object getData() {
+            return this.data;
         }
     }
 
@@ -372,11 +369,11 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
 
             DrawerItem item = getItem(position);
 
+            ImageView iv = row.findViewById(R.id.ivItem);
             TextView tv = row.findViewById(R.id.tvItem);
-            CheckBox cb = row.findViewById(R.id.cbItem);
-            tv.setText(item.getTitle());
-            cb.setVisibility(item.isCheckable() ? View.VISIBLE : View.GONE);
-            cb.setChecked(item.isChecked());
+
+            iv.setImageResource(item.icon);
+            tv.setText(item.title);
 
             return row;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 66a93eed..36f8e783 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -51,20 +51,20 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             implements View.OnClickListener, View.OnLongClickListener {
         View itemView;
         TextView tvName;
+        TextView tvMessages;
+        TextView tvType;
         TextView tvAfter;
         ImageView ivSync;
-        TextView tvAccount;
-        TextView tvType;
 
         ViewHolder(View itemView) {
             super(itemView);
 
             this.itemView = itemView;
             tvName = itemView.findViewById(R.id.tvName);
+            tvMessages = itemView.findViewById(R.id.tvMessages);
+            tvType = itemView.findViewById(R.id.tvType);
             tvAfter = itemView.findViewById(R.id.tvAfter);
             ivSync = itemView.findViewById(R.id.ivSync);
-            tvAccount = itemView.findViewById(R.id.tvAccount);
-            tvType = itemView.findViewById(R.id.tvType);
         }
 
         private void wire() {
@@ -79,23 +79,25 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
         private void bindTo(TupleFolderEx folder) {
             String name = Helper.localizeFolderName(context, folder.name);
-            tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen, folder.messages));
+            if (folder.unseen > 0)
+                tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
+            else
+                tvName.setText(name);
             tvName.setTypeface(null, folder.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
             tvName.setTextColor(Helper.resolveColor(context, folder.unseen > 0 ? R.attr.colorUnread : android.R.attr.textColorSecondary));
 
-            tvAfter.setText(Integer.toString(folder.after));
-            tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
-
-            ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
-
-            tvAccount.setText(folder.accountName);
-            tvAccount.setVisibility(EntityFolder.TYPE_OUTBOX.equals(folder.type) ? View.GONE : View.VISIBLE);
+            tvMessages.setText(Integer.toString(folder.messages));
 
             int resid = context.getResources().getIdentifier(
                     "title_folder_" + folder.type.toLowerCase(),
                     "string" ,
                     context.getPackageName());
             tvType.setText(resid > 0 ? context.getString(resid) : folder.type);
+
+            tvAfter.setText(Integer.toString(folder.after));
+            tvAfter.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
+
+            ivSync.setVisibility(folder.synchronize ? View.VISIBLE : View.INVISIBLE);
         }
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index 5ca5a7d1..5d29936c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -25,7 +25,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -45,7 +44,6 @@ public class FragmentAbout extends FragmentEx {
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         setSubtitle(R.string.menu_about);
-        setHasOptionsMenu(true);
 
         View view = inflater.inflate(R.layout.fragment_about, container, false);
 
@@ -97,9 +95,4 @@ public class FragmentAbout extends FragmentEx {
 
         return view;
     }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        menu.clear();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index a8feacca..ba1b3d83 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -28,7 +28,6 @@ import android.support.design.widget.FloatingActionButton;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
@@ -48,7 +47,6 @@ public class FragmentFolders extends FragmentEx {
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         setSubtitle(R.string.title_list_folders);
-        setHasOptionsMenu(true);
 
         View view = inflater.inflate(R.layout.fragment_folders, container, false);
 
@@ -94,9 +92,4 @@ public class FragmentFolders extends FragmentEx {
 
         return view;
     }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        menu.clear();
-    }
 }
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_black_18.png b/app/src/main/res/drawable-hdpi/baseline_help_black_18.png
new file mode 100755
index 00000000..32634e62
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_black_24.png b/app/src/main/res/drawable-hdpi/baseline_help_black_24.png
new file mode 100755
index 00000000..5e282bce
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_black_36.png b/app/src/main/res/drawable-hdpi/baseline_help_black_36.png
new file mode 100755
index 00000000..aea20a0b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_black_48.png b/app/src/main/res/drawable-hdpi/baseline_help_black_48.png
new file mode 100755
index 00000000..16ef4529
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_white_18.png b/app/src/main/res/drawable-hdpi/baseline_help_white_18.png
new file mode 100755
index 00000000..098fe4f4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_white_24.png b/app/src/main/res/drawable-hdpi/baseline_help_white_24.png
new file mode 100755
index 00000000..2d022bf9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_white_36.png b/app/src/main/res/drawable-hdpi/baseline_help_white_36.png
new file mode 100755
index 00000000..7555f3a8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_help_white_48.png b/app/src/main/res/drawable-hdpi/baseline_help_white_48.png
new file mode 100755
index 00000000..0ea764fc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_help_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_black_18.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_18.png
new file mode 100755
index 00000000..5ea7e1c8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_black_24.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_24.png
new file mode 100755
index 00000000..3f46522a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_black_36.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_36.png
new file mode 100755
index 00000000..1a8fc3f1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_black_48.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_48.png
new file mode 100755
index 00000000..859acc6a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_white_18.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_18.png
new file mode 100755
index 00000000..5463f683
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_white_24.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_24.png
new file mode 100755
index 00000000..67924a5a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_white_36.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_36.png
new file mode 100755
index 00000000..586d4397
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_question_answer_white_48.png b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_48.png
new file mode 100755
index 00000000..255b8270
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_question_answer_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_18.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_18.png
new file mode 100755
index 00000000..6d5b2790
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png
new file mode 100755
index 00000000..62643efc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_36.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_36.png
new file mode 100755
index 00000000..b4d05d45
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_48.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_48.png
new file mode 100755
index 00000000..dde108b6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_18.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_18.png
new file mode 100755
index 00000000..d37cf84a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_24.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_24.png
new file mode 100755
index 00000000..be9f07a2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_36.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_36.png
new file mode 100755
index 00000000..3af42f9e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_48.png b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_48.png
new file mode 100755
index 00000000..4c1aa8c0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_settings_applications_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_black_18.png b/app/src/main/res/drawable-mdpi/baseline_help_black_18.png
new file mode 100755
index 00000000..295008fd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_black_24.png b/app/src/main/res/drawable-mdpi/baseline_help_black_24.png
new file mode 100755
index 00000000..1991c1e3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_black_36.png b/app/src/main/res/drawable-mdpi/baseline_help_black_36.png
new file mode 100755
index 00000000..5e282bce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_black_48.png b/app/src/main/res/drawable-mdpi/baseline_help_black_48.png
new file mode 100755
index 00000000..4d6a2f52
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_white_18.png b/app/src/main/res/drawable-mdpi/baseline_help_white_18.png
new file mode 100755
index 00000000..c80c3ab3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_white_24.png b/app/src/main/res/drawable-mdpi/baseline_help_white_24.png
new file mode 100755
index 00000000..9737d730
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_white_36.png b/app/src/main/res/drawable-mdpi/baseline_help_white_36.png
new file mode 100755
index 00000000..2d022bf9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_help_white_48.png b/app/src/main/res/drawable-mdpi/baseline_help_white_48.png
new file mode 100755
index 00000000..657949a4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_help_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_black_18.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_18.png
new file mode 100755
index 00000000..66da789b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_black_24.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_24.png
new file mode 100755
index 00000000..d003d5e4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_black_36.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_36.png
new file mode 100755
index 00000000..3f46522a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_black_48.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_48.png
new file mode 100755
index 00000000..9061029e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_white_18.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_18.png
new file mode 100755
index 00000000..310adaac
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_white_24.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_24.png
new file mode 100755
index 00000000..e87df752
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_white_36.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_36.png
new file mode 100755
index 00000000..67924a5a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_question_answer_white_48.png b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_48.png
new file mode 100755
index 00000000..731f89c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_question_answer_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_18.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_18.png
new file mode 100755
index 00000000..ddbb2cd3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png
new file mode 100755
index 00000000..b3da5785
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_36.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_36.png
new file mode 100755
index 00000000..62643efc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_48.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_48.png
new file mode 100755
index 00000000..6a75c2e2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_18.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_18.png
new file mode 100755
index 00000000..e9e5a173
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_24.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_24.png
new file mode 100755
index 00000000..691c8e4e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_36.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_36.png
new file mode 100755
index 00000000..be9f07a2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_48.png b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_48.png
new file mode 100755
index 00000000..5d7a1bce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_settings_applications_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_help_black_18.png
new file mode 100755
index 00000000..5e282bce
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_help_black_24.png
new file mode 100755
index 00000000..4d6a2f52
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_help_black_36.png
new file mode 100755
index 00000000..16ef4529
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_help_black_48.png
new file mode 100755
index 00000000..a469548d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_help_white_18.png
new file mode 100755
index 00000000..2d022bf9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_help_white_24.png
new file mode 100755
index 00000000..657949a4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_help_white_36.png
new file mode 100755
index 00000000..0ea764fc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_help_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_help_white_48.png
new file mode 100755
index 00000000..478a7856
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_help_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_18.png
new file mode 100755
index 00000000..3f46522a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_24.png
new file mode 100755
index 00000000..9061029e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_36.png
new file mode 100755
index 00000000..859acc6a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_48.png
new file mode 100755
index 00000000..94942f6a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_18.png
new file mode 100755
index 00000000..67924a5a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_24.png
new file mode 100755
index 00000000..731f89c8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_36.png
new file mode 100755
index 00000000..255b8270
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_48.png
new file mode 100755
index 00000000..0d697e0f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_question_answer_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_18.png
new file mode 100755
index 00000000..62643efc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png
new file mode 100755
index 00000000..6a75c2e2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_36.png
new file mode 100755
index 00000000..dde108b6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_48.png
new file mode 100755
index 00000000..ec56814c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_18.png
new file mode 100755
index 00000000..be9f07a2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_24.png
new file mode 100755
index 00000000..5d7a1bce
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_36.png
new file mode 100755
index 00000000..4c1aa8c0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_48.png
new file mode 100755
index 00000000..9bc146f8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_settings_applications_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_help_black_18.png
new file mode 100755
index 00000000..aea20a0b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_help_black_24.png
new file mode 100755
index 00000000..16ef4529
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_help_black_36.png
new file mode 100755
index 00000000..bad963e6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_help_black_48.png
new file mode 100755
index 00000000..a0dbcb0f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_help_white_18.png
new file mode 100755
index 00000000..7555f3a8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_help_white_24.png
new file mode 100755
index 00000000..0ea764fc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_help_white_36.png
new file mode 100755
index 00000000..32a0e941
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_help_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_help_white_48.png
new file mode 100755
index 00000000..efa2b955
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_help_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_18.png
new file mode 100755
index 00000000..1a8fc3f1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_24.png
new file mode 100755
index 00000000..859acc6a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_36.png
new file mode 100755
index 00000000..b934d633
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_48.png
new file mode 100755
index 00000000..41e461a6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_18.png
new file mode 100755
index 00000000..586d4397
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_24.png
new file mode 100755
index 00000000..255b8270
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_36.png
new file mode 100755
index 00000000..a2296a1a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_48.png
new file mode 100755
index 00000000..8c2c774e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_question_answer_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_18.png
new file mode 100755
index 00000000..b4d05d45
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png
new file mode 100755
index 00000000..dde108b6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_36.png
new file mode 100755
index 00000000..08561899
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_48.png
new file mode 100755
index 00000000..efb61e70
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_18.png
new file mode 100755
index 00000000..3af42f9e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_24.png
new file mode 100755
index 00000000..4c1aa8c0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_36.png
new file mode 100755
index 00000000..afc16734
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_48.png
new file mode 100755
index 00000000..2c237b6f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_settings_applications_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_18.png
new file mode 100755
index 00000000..16ef4529
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_24.png
new file mode 100755
index 00000000..a469548d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_36.png
new file mode 100755
index 00000000..a0dbcb0f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_48.png
new file mode 100755
index 00000000..38765339
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_18.png
new file mode 100755
index 00000000..0ea764fc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_24.png
new file mode 100755
index 00000000..478a7856
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_36.png
new file mode 100755
index 00000000..efa2b955
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_help_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_48.png
new file mode 100755
index 00000000..8c655920
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_help_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_18.png
new file mode 100755
index 00000000..859acc6a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_24.png
new file mode 100755
index 00000000..94942f6a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_36.png
new file mode 100755
index 00000000..41e461a6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_48.png
new file mode 100755
index 00000000..15e811c6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_18.png
new file mode 100755
index 00000000..255b8270
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_24.png
new file mode 100755
index 00000000..0d697e0f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_36.png
new file mode 100755
index 00000000..8c2c774e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_48.png
new file mode 100755
index 00000000..c6f403f1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_question_answer_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_18.png
new file mode 100755
index 00000000..dde108b6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png
new file mode 100755
index 00000000..ec56814c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_36.png
new file mode 100755
index 00000000..efb61e70
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_48.png
new file mode 100755
index 00000000..148a505b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_18.png
new file mode 100755
index 00000000..4c1aa8c0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_24.png
new file mode 100755
index 00000000..9bc146f8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_36.png
new file mode 100755
index 00000000..2c237b6f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_48.png
new file mode 100755
index 00000000..70ea4468
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_settings_applications_white_48.png differ
diff --git a/app/src/main/res/drawable/baseline_help_24.xml b/app/src/main/res/drawable/baseline_help_24.xml
new file mode 100755
index 00000000..0f0039ca
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_help_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_question_answer_24.xml b/app/src/main/res/drawable/baseline_question_answer_24.xml
new file mode 100755
index 00000000..41a3f8d9
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_question_answer_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_settings_applications_24.xml b/app/src/main/res/drawable/baseline_settings_applications_24.xml
new file mode 100755
index 00000000..05aec289
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_settings_applications_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_drawer.xml b/app/src/main/res/layout/item_drawer.xml
index f10389c2..c51e455a 100644
--- a/app/src/main/res/layout/item_drawer.xml
+++ b/app/src/main/res/layout/item_drawer.xml
@@ -6,27 +6,26 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart">
 
+    <ImageView
+        android:id="@+id/ivItem"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:gravity="center_vertical"
+        android:src="@drawable/baseline_mail_outline_24"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tvItem"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:gravity="center_vertical"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:text="Menu item"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/cbItem"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <CheckBox
-        android:id="@+id/cbItem"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/ivItem"
         app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index f5b34bf6..f1f07dbb 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -14,52 +14,61 @@
         android:ellipsize="start"
         android:text="Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintBottom_toBottomOf="@+id/ivSync"
+        app:layout_constraintBottom_toBottomOf="@+id/ivMessages"
         app:layout_constraintEnd_toStartOf="@+id/tvAfter"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/ivSync" />
+        app:layout_constraintTop_toTopOf="@+id/ivMessages" />
 
     <TextView
-        android:id="@+id/tvAfter"
+        android:id="@+id/tvMessages"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="7"
+        android:layout_marginEnd="6dp"
+        android:text="123"
         android:textAppearance="@android:style/TextAppearance.Small"
-        app:layout_constraintBottom_toBottomOf="@+id/ivSync"
-        app:layout_constraintEnd_toStartOf="@+id/ivSync"
-        app:layout_constraintTop_toTopOf="@+id/ivSync" />
+        app:layout_constraintBottom_toBottomOf="@+id/ivMessages"
+        app:layout_constraintEnd_toStartOf="@+id/ivMessages"
+        app:layout_constraintTop_toTopOf="@+id/ivMessages" />
 
     <ImageView
-        android:id="@+id/ivSync"
+        android:id="@+id/ivMessages"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginEnd="6dp"
-        android:src="@drawable/baseline_sync_24"
+        android:src="@drawable/baseline_mail_outline_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/tvAccount"
+        android:id="@+id/tvType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
-        android:text="account"
+        android:text="type"
         android:textAppearance="@android:style/TextAppearance.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/ivSync"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivSync" />
+        app:layout_constraintTop_toTopOf="@+id/ivSync" />
 
     <TextView
-        android:id="@+id/tvType"
-        android:layout_width="0dp"
+        android:id="@+id/tvAfter"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
-        android:layout_marginStart="6dp"
-        android:text="type"
-        android:textAlignment="textEnd"
+        android:text="30"
         android:textAppearance="@android:style/TextAppearance.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/ivSync"
+        app:layout_constraintEnd_toStartOf="@+id/ivSync"
+        app:layout_constraintTop_toTopOf="@+id/ivSync" />
+
+    <ImageView
+        android:id="@+id/ivSync"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="6dp"
+        android:src="@drawable/baseline_sync_24"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvAccount"
-        app:layout_constraintTop_toBottomOf="@id/ivSync" />
+        app:layout_constraintTop_toBottomOf="@id/ivMessages" />
 
     <View
         android:id="@+id/vSeparator"
@@ -68,5 +77,5 @@
         android:layout_marginTop="6dp"
         android:background="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvType" />
+        app:layout_constraintTop_toBottomOf="@id/ivSync" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_view.xml b/app/src/main/res/menu/menu_view.xml
deleted file mode 100644
index c8686094..00000000
--- a/app/src/main/res/menu/menu_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_folders"
-        android:icon="@drawable/baseline_folder_24"
-        android:title="@string/menu_folders"
-        app:showAsAction="always" />
-</menu>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 876a0067..86acee3f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,6 @@
   <string name="title_notification_operations">%1$d operation(s) pending</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_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</string>
   <string name="title_no_idle">IDLE wird nicht unterstützt</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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Empfänger fehlt</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_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ef712259..d23f5880 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,111 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <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>
-  <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="menu_folders">Folders</string>
-  <string name="menu_setup">Setup</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 por M. Bokhorst</string>
+  <string name="channel_service">Serviço</string>
+  <string name="channel_notification">Notificações</string>
+  <string name="channel_error">Erros</string>
+  <string name="title_notification_synchronizing">Sincronizando %1$d conta(s)</string>
+  <string name="title_notification_operations">%1$d operações pendentes</string>
+  <string name="title_notification_unseen">%1$d novas mensagens</string>
+  <string name="title_notification_failed">\'%1$s\' falhou</string>
+  <string name="menu_setup">Configurar</string>
   <string name="menu_faq">FAQ</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>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_account">Manage accounts</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity">Manage identities</string>
-  <string name="title_setup_identity_remark">To send email</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">Used to differentiate folders</string>
+  <string name="menu_about">Sobre</string>
+  <string name="title_agree">Eu concordo</string>
+  <string name="title_disagree">Eu discordo</string>
+  <string name="title_version">Versão %1$s</string>
+  <string name="title_list_accounts">Contas</string>
+  <string name="title_list_identities">Identidades</string>
+  <string name="title_list_folders">Pastas</string>
+  <string name="title_edit_account">Editar conta</string>
+  <string name="title_edit_identity">Editar identidade</string>
+  <string name="title_edit_folder">Editar pasta</string>
+  <string name="title_setup">Configurar</string>
+  <string name="title_setup_account">Gerenciar contas</string>
+  <string name="title_setup_account_remark">Receber e-mail</string>
+  <string name="title_setup_identity">Gerenciar identidades</string>
+  <string name="title_setup_identity_remark">Para enviar e-mail</string>
+  <string name="title_setup_permissions">Garantir permissões</string>
+  <string name="title_setup_permissions_remark">Para ler os contatos (opcional)</string>
+  <string name="title_setup_done">Feito</string>
+  <string name="title_setup_dark_theme">Tema escuro</string>
+  <string name="title_setup_debug">Depurar</string>
+  <string name="title_name">Seu nome</string>
+  <string name="title_email">Seu endereço de e-mail</string>
+  <string name="title_reply_to">Resposta para o endereço</string>
+  <string name="title_optional">Opcional</string>
+  <string name="title_account_name">Nome da conta</string>
+  <string name="title_account_name_hint">Usada para diferenciar pastas</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
-  <string name="title_host">Host name</string>
+  <string name="title_provider">Provedor</string>
+  <string name="title_custom">Personalizado</string>
+  <string name="title_host">Nome do servidor</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
-  <string name="title_synchronize_account">Synchronize (receive messages)</string>
-  <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (used to store drafts)</string>
-  <string name="title_primary_identity">Primary (default identity)</string>
-  <string name="title_no_name">Name mandatory</string>
-  <string name="title_no_email">Email address mandatory</string>
-  <string name="title_no_host">Host name missing</string>
-  <string name="title_no_port">Port number missing</string>
-  <string name="title_no_user">User name missing</string>
-  <string name="title_no_password">Password missing</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/%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>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_all">Archive</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_trash">Trash</string>
+  <string name="title_port">Número da porta</string>
+  <string name="title_user">Nome de usuário</string>
+  <string name="title_password">Senha</string>
+  <string name="title_synchronize_account">Sincronizar (receber mensagens)</string>
+  <string name="title_synchronize_identity">Sincronizar (enviar mensagens)</string>
+  <string name="title_primary_account">Primária (usada para armazenar rascunhos)</string>
+  <string name="title_primary_identity">Primária (identidade padrão)</string>
+  <string name="title_no_name">Nome obrigatório</string>
+  <string name="title_no_email">Endereço de e-mail obrigatório</string>
+  <string name="title_no_host">Nome do servidor faltante</string>
+  <string name="title_no_port">Número da porta faltante</string>
+  <string name="title_no_user">Nome do usuário faltante</string>
+  <string name="title_no_password">Senha faltante</string>
+  <string name="title_no_idle">IDLE não suportado</string>
+  <string name="title_local_drafts">Rascunhos locais</string>
+  <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
+  <string name="title_after">Sincronizar (dias)</string>
+  <string name="title_folder_unified">Caixa de entrada unificada</string>
+  <string name="title_folder_inbox">Caixa de entrada</string>
+  <string name="title_folder_outbox">Caixa de saída</string>
+  <string name="title_folder_all">Arquivo</string>
+  <string name="title_folder_drafts">Rascunhos</string>
+  <string name="title_folder_trash">Lixeira</string>
   <string name="title_folder_junk">Spam</string>
-  <string name="title_folder_sent">Sent</string>
-  <string name="title_folder_user">User</string>
-  <string name="title_folder_thread">Message thread</string>
-  <string name="title_no_messages">No messages</string>
+  <string name="title_folder_sent">Enviado</string>
+  <string name="title_folder_user">Usuário</string>
+  <string name="title_folder_thread">Tópico da mensagem</string>
+  <string name="title_no_messages">Sem mensagens</string>
   <string name="title_link">link</string>
-  <string name="title_image">image</string>
+  <string name="title_image">imagem</string>
   <string name="title_subject_reply">Re: %1$s</string>
-  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Thread</string>
-  <string name="title_seen">Read</string>
-  <string name="title_unseen">Unread</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_trash">Trash</string>
+  <string name="title_subject_forward">Enc: %1$s</string>
+  <string name="title_thread">Tópico</string>
+  <string name="title_seen">Lida</string>
+  <string name="title_unseen">Não lida</string>
+  <string name="title_forward">Encaminhar</string>
+  <string name="title_reply_all">Responder a todos</string>
+  <string name="title_trash">Lixeira</string>
   <string name="title_spam">Spam</string>
-  <string name="title_move">Move</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_no_viewer">No viewer app available</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
-  <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
+  <string name="title_move">Mover</string>
+  <string name="title_archive">Arquivar</string>
+  <string name="title_reply">Responder</string>
+  <string name="title_no_viewer">Sem aplicativo visualizador</string>
+  <string name="title_ask_delete">Deletar mensagem permanentemente?</string>
+  <string name="title_ask_spam">Reportar mensagem com spam?</string>
+  <string name="title_compose">Escrever</string>
+  <string name="title_from">De:</string>
+  <string name="title_to">Para:</string>
   <string name="title_cc">CC:</string>
   <string name="title_bcc">BCC:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
-  <string name="title_no_primary_drafts">No primary account or no drafts folder</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
-  <string name="title_draft_trashed">Draft trashed</string>
-  <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
-  <string name="title_item_edit_hint">Long press item to edit properties</string>
-  <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>
+  <string name="title_subject">Assunto:</string>
+  <string name="title_body_hint">Sua mensagem</string>
+  <string name="title_save">Salvar</string>
+  <string name="title_send">Enviar</string>
+  <string name="title_no_primary_drafts">Sem conta primária ou sem pasta de rascunhos</string>
+  <string name="title_from_missing">Remetente faltante</string>
+  <string name="title_to_missing">Destinatário faltante</string>
+  <string name="title_draft_trashed">Rascunho excluído</string>
+  <string name="title_draft_saved">Rascunho salvo</string>
+  <string name="title_queued">Sending message</string>
+  <string name="title_item_edit_hint">Pressione e segure o item para editar suas propriedades</string>
+  <string name="title_debug_info">Informações de depuração</string>
+  <string name="title_debug_info_remark">Por favor, descreva o problema e indique o momento em que ocorrera:</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 ef712259..d774b3c4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 08b714f1..da433ab4 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Drepturi de autor &#x24B8; 2018 de M. Bokhorst</string>
   <string name="channel_service">Serviciu</string>
   <string name="channel_notification">Notificări</string>
   <string name="channel_error">Erori</string>
@@ -9,13 +9,12 @@
   <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_faq">FAQ</string>
-  <string name="menu_about">About</string>
+  <string name="menu_faq">Întrebări frecvente</string>
+  <string name="menu_about">Despre</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_version">Versiunea %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>
@@ -23,21 +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">Manage accounts</string>
+  <string name="title_setup_account">Gestionarea conturilor</string>
   <string name="title_setup_account_remark">Pentru a primi e-mail</string>
-  <string name="title_setup_identity">Manage identities</string>
+  <string name="title_setup_identity">Gestionarea identităţilor</string>
   <string name="title_setup_identity_remark">Pentru a trimite e-mail</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">Temă întunecată</string>
-  <string name="title_setup_debug">Debug</string>
+  <string name="title_setup_debug">Depanare</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">Used to differentiate folders</string>
+  <string name="title_account_name_hint">Folosit la diferențierea dosarelor</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Furnizor</string>
@@ -53,13 +52,12 @@
   <string name="title_primary_identity">Primară (identitatea implicită)</string>
   <string name="title_no_name">Numele este obligatoriu</string>
   <string name="title_no_email">Adresa de e-mail este obligatorie</string>
-  <string name="title_no_host">Host name missing</string>
-  <string name="title_no_port">Port number missing</string>
-  <string name="title_no_user">User name missing</string>
-  <string name="title_no_password">Password missing</string>
+  <string name="title_no_host">Lipsește numele serverului</string>
+  <string name="title_no_port">Lipsește numărul portului</string>
+  <string name="title_no_user">Lipsește numele de utilizator</string>
+  <string name="title_no_password">Lipsește parola</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/%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>
@@ -104,8 +102,8 @@
   <string name="title_to_missing">Destinatar lipsă</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_queued">Expediere mesaj</string>
   <string name="title_item_edit_hint">Apăsați lung pentru a edita proprietățile</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>
+  <string name="title_debug_info">Depanare</string>
+  <string name="title_debug_info_remark">Va rog sa descrieți problema și să indicați momentul când s-a produs:</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ef712259..d774b3c4 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,7 +9,6 @@
   <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="menu_folders">Folders</string>
   <string name="menu_setup">Setup</string>
   <string name="menu_faq">FAQ</string>
   <string name="menu_about">About</string>
@@ -59,7 +58,6 @@
   <string name="title_no_password">Password missing</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/%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>
@@ -104,7 +102,7 @@
   <string name="title_to_missing">Recipient missing</string>
   <string name="title_draft_trashed">Draft trashed</string>
   <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Message queued</string>
+  <string name="title_queued">Sending message</string>
   <string name="title_item_edit_hint">Long press item to edit properties</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46372f6e..800035a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="title_notification_unseen">%1$d new message(s)</string>
     <string name="title_notification_failed">\'%1$s\' failed</string>
 
-    <string name="menu_folders">Folders</string>
     <string name="menu_setup">Setup</string>
     <string name="menu_faq">FAQ</string>
     <string name="menu_about">About</string>
@@ -69,7 +68,7 @@
     <string name="title_no_idle">IDLE not supported</string>
     <string name="title_local_drafts">Local drafts</string>
 
-    <string name="title_folder_unseen" translatable="false">%1$s (%2$d/%3$d)</string>
+    <string name="title_folder_unseen" translatable="false">%1$s (%2$d)</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
     <string name="title_after">Synchronize (days)</string>