diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 61634c872..631edfd60 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1704,8 +1704,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
 
         private final ActivityListener mListener = new ActivityListener() {
 
-            // TODO achen - may need to add a setSupportProgress to mHandler to run on the UI thread.
-
             @Override
             public void remoteSearchAddMessage(Account account, String folderName, Message message, final int numDone, final int numTotal) {
 
@@ -1715,7 +1713,7 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
                     setSupportProgress(Window.PROGRESS_END);
                 }
 
-                addOrUpdateMessages(account, folderName, Collections.singletonList(message), false);
+                mHandler.addOrUpdateMessages(account, folderName, Collections.singletonList(message), false);
             }
 
             @Override
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 8a5f11761..073351e6a 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -855,6 +855,7 @@ public class MessagingController implements Runnable {
 
 
         } catch (Exception e) {
+            Log.e(K9.LOG_TAG, "Could not complete remote search", e);
             if (listener != null) {
                 listener.remoteSearchFailed(acct, null, e.getMessage());
             }