diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5d8d60ff34..a4e181e80c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2826,7 +2826,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 ToastEx.makeText(getContext(),
                         getContext().getResources().getQuantityString(
-                                R.plurals.title_selected_messages, ids.size(), ids.size()),
+                                R.plurals.title_selected_conversations, ids.size(), ids.size()),
                         Toast.LENGTH_LONG).show();
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index b040082440..0c18251f89 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -273,6 +273,7 @@ public class ViewModelMessages extends ViewModel {
                 PagedList<TupleMessageEx> plist = model.list.getValue();
                 if (plist == null)
                     return ids;
+
                 LimitOffsetDataSource<TupleMessageEx> ds = (LimitOffsetDataSource<TupleMessageEx>) plist.getDataSource();
                 int count = ds.countItems();
                 for (int i = 0; i < count; i += 100)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8314db2a4f..c5c5522a3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,9 +63,9 @@
         <item quantity="other">%1$d new</item>
     </plurals>
 
-    <plurals name="title_selected_messages">
-        <item quantity="one">Selected %1$d message</item>
-        <item quantity="other">Selected %1$d messages</item>
+    <plurals name="title_selected_conversations">
+        <item quantity="one">Selected %1$d conversation</item>
+        <item quantity="other">Selected %1$d conversations</item>
     </plurals>
 
     <plurals name="title_moving_messages">