diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 0ac014c702..69a04fa0ec 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -437,7 +437,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                     return state.ifolder.search(term);
                                 }
                             } catch (MessagingException ex) {
-                                throw new ProtocolException("Search", ex);
+                                ProtocolException pex = new ProtocolException(
+                                        "Search " + account.host + " " + criteria, ex);
+                                Log.e(pex);
+                                throw pex;
                             }
                         }
                     });