diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index 1e5b7fa3c..f94b2279c 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -1380,8 +1380,6 @@ public class MessagingController implements Runnable {
  
         Message remoteMessage = null;
         if (!uid.startsWith(Email.LOCAL_UID_PREFIX)) {
-       // Why bother with this, perhaps just pass the UID to the store to save a roundtrip?  And check for error returns, of course
-       // Same applies for deletion
             remoteMessage = remoteSrcFolder.getMessage(uid);      
         }
         if (remoteMessage == null) {
diff --git a/src/com/android/email/mail/store/ImapStore.java b/src/com/android/email/mail/store/ImapStore.java
index d9cce53d4..0c3345a69 100644
--- a/src/com/android/email/mail/store/ImapStore.java
+++ b/src/com/android/email/mail/store/ImapStore.java
@@ -585,31 +585,7 @@ public class ImapStore extends Store {
 
         @Override
         public Message getMessage(String uid) throws MessagingException {
-            checkOpen();
-
-            try {
-                try {
-                    List<ImapResponse> responses =
-                            executeSimpleCommand(String.format("UID SEARCH UID %S", uid));
-                    for (ImapResponse response : responses) {
-			//			Log.d(Email.LOG_TAG, "Got search response: " + response.get(0) + ", size " + response.size());
-                        if (response.mTag == null && response.get(0).equals("SEARCH")) {
-                            for (int i = 1, count = response.size(); i < count; i++) {
-                                if (uid.equals(response.get(i))) {
-                                    return new ImapMessage(uid, this);
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (MessagingException me) {
-                    return null;
-                }
-            }
-            catch (IOException ioe) {
-                throw ioExceptionHandler(mConnection, ioe);
-            }
-            return null;
+	    return new ImapMessage(uid, this);
         }
 
         @Override