diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 42da65e8ac..b4e9bb8636 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -595,7 +595,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                             if (ex instanceof ProtocolException &&
                                                     ex.getMessage() != null &&
                                                     ex.getMessage().contains("full text search not supported")) {
-                                                String msg = context.getString(R.string.title_service_auth, ex.toString());
+                                                String msg = context.getString(R.string.title_service_auth,
+                                                        account.host + ": " + getMessage(ex));
                                                 ApplicationEx.getMainHandler().post(new Runnable() {
                                                     @Override
                                                     public void run() {
@@ -614,7 +615,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                     if (ex instanceof ProtocolException)
                                         pex = new ProtocolException(
                                                 context.getString(R.string.title_service_auth,
-                                                        account.host + ": " + ex.getMessage()),
+                                                        account.host + ": " + getMessage(ex)),
                                                 ex.getCause());
                                     else
                                         pex = new ProtocolException("Search " + account.host, ex);
@@ -735,6 +736,16 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         return found;
     }
 
+    private String getMessage(Throwable ex) {
+        if (ex instanceof ProtocolException) {
+            Response r = ((ProtocolException) ex).getResponse();
+            if (r != null && !TextUtils.isEmpty(r.getRest()))
+                return r.getRest();
+        }
+
+        return ex.toString();
+    }
+
     private Message[] search(boolean utf8, String[] keywords, IMAPProtocol protocol, State state) throws IOException, MessagingException, ProtocolException {
         EntityLog.log(context, "Search utf8=" + utf8);