From ac6358ec5cbbbf595165e2f7d0bae1cb7489a574 Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Tue, 15 Sep 2009 04:28:37 +0000
Subject: [PATCH] svn merge -c 749 ../issue4-1.X .

ImapStore.ImapFolder is not thread-safe, so all access to the remote
folders must be done through the work processing of the
MessagingController.
---
 .../android/email/activity/MessageView.java   | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 3060db042..12a4283e5 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -117,7 +117,7 @@ public class MessageView extends K9Activity
 
     //Shall we use more threads? How often will the user move from non-fully-downloaded
     //messages to another non-fully-downloaded message more than 3 times?
-    private final ExecutorService threadPool = Executors.newFixedThreadPool(3);
+ //   private final ExecutorService threadPool = Executors.newFixedThreadPool(3);
     
     private DateFormat getDateFormat()
     {
@@ -486,17 +486,13 @@ public class MessageView extends K9Activity
         if (previous_scrolling != null)
             previous_scrolling.setEnabled(mPreviousMessageUid != null);
 
-        Runnable loaderThread = new Runnable() {
-            public void run() {
-                MessagingController.getInstance(getApplication()).loadMessageForViewSynchronous(
-                    mAccount,
-                    mFolder,
-                    mMessageUid,
-                    null);
-            }
-        };
-
-        threadPool.execute(loaderThread);
+        MessagingController.getInstance(getApplication()).loadMessageForView(
+            mAccount,
+            mFolder,
+            mMessageUid,
+            null);
+            
+        
     }
     
     
@@ -539,12 +535,12 @@ public class MessageView extends K9Activity
     public void onResume() {
         super.onResume();
         clearFormats();
-        MessagingController.getInstance(getApplication()).addListener(mListener);
+        //MessagingController.getInstance(getApplication()).addListener(mListener);
     }
 
     public void onPause() {
         super.onPause();
-        MessagingController.getInstance(getApplication()).removeListener(mListener);
+        //MessagingController.getInstance(getApplication()).removeListener(mListener);
     }
     
     private void onDelete() {