diff --git a/FAQ.md b/FAQ.md
index b969653216..1c00dd7ec8 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1280,6 +1280,10 @@ Long version:
 All supported Android versions [encrypt all user data](https://source.android.com/security/encryption),
 so all data, including usernames, passwords, messages, etc, is stored encrypted.
 
+If the device is secured with a PIN, pattern or password, you can make the account and identity passwords visible.
+If this is a problem because you are sharing the device with other people,
+consider to use [user profiles](https://www.howtogeek.com/333484/how-to-set-up-multiple-user-profiles-on-android/).
+
 <br />
 
 <a name="faq39"></a>
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 55d3e20acb..d5ab8e486f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -714,6 +714,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         aargs.putString("question", context.getString(R.string.title_empty_spam_ask));
                     else
                         throw new IllegalArgumentException("Invalid folder type=" + type);
+                    aargs.putString("remark", context.getString(R.string.title_empty_all));
                     aargs.putLong("folder", folder.id);
                     aargs.putString("type", type);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
index 81b3acd3f5..732e4009cc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogAsk.java
@@ -40,13 +40,17 @@ public class FragmentDialogAsk extends FragmentDialogBase {
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
         String question = getArguments().getString("question");
+        String remark = getArguments().getString("remark");
         String notagain = getArguments().getString("notagain");
 
         View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null);
         TextView tvMessage = dview.findViewById(R.id.tvMessage);
+        TextView tvRemark = dview.findViewById(R.id.tvRemark);
         CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
         tvMessage.setText(question);
+        tvRemark.setText(remark);
+        tvRemark.setVisibility(remark == null ? View.GONE : View.VISIBLE);
         cbNotAgain.setVisibility(notagain == null ? View.GONE : View.VISIBLE);
 
         if (notagain != null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 73721f3ac2..83783a8102 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3768,6 +3768,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     account < 0 ? R.string.title_empty_spam_all_ask : R.string.title_empty_spam_ask));
         else
             throw new IllegalArgumentException("Invalid folder type=" + type);
+        aargs.putString("remark", getString(R.string.title_empty_all));
         aargs.putLong("account", account);
         aargs.putString("type", type);
 
@@ -4157,14 +4158,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             updateExpanded();
 
-            // This is to workaround not drawing when the search is expanded
-            new Handler().post(new Runnable() {
-                @Override
-                public void run() {
-                    rvMessage.requestLayout();
-                }
-            });
-
             initialized = true;
             updateListState("Observed", SimpleTask.getCount(), messages.size());
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index aec36e2cef..486e15a2d5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -99,6 +99,9 @@ public class ServiceSend extends ServiceBase {
                     } catch (Throwable ex) {
                         Log.w(ex);
                     }
+
+                    if (unsent == null || unsent.count == 0)
+                        stopSelf();
                 }
             }
         });
@@ -110,9 +113,6 @@ public class ServiceSend extends ServiceBase {
                 if (operations == null)
                     operations = new ArrayList<>();
 
-                if (operations.size() == 0)
-                    stopSelf();
-
                 final List<TupleOperationEx> process = new ArrayList<>();
 
                 List<Long> ops = new ArrayList<>();
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index ac560cb337..c3cebd9cf6 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -20,6 +20,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="Remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+
         <CheckBox
             android:id="@+id/cbNotAgain"
             android:layout_width="wrap_content"
@@ -28,6 +39,6 @@
             android:text="@string/title_no_ask_again"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+            app:layout_constraintTop_toBottomOf="@id/tvRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ab36574cc..9559d22fff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -698,6 +698,7 @@
     <string name="title_empty_spam_ask">Delete all spam messages permanently?</string>
     <string name="title_empty_trash_all_ask">Delete all trashed messages of all accounts permanently?</string>
     <string name="title_empty_spam_all_ask">Delete all spam messages of all accounts permanently?</string>
+    <string name="title_empty_all">This will delete all messages both from the device and the server</string>
     <string name="title_delete_operation">Delete operations with an error message?</string>
     <string name="title_delete_contacts">Delete all local contacts?</string>
     <string name="title_no_operations">No pending operations</string>