From 204289a4fff14e856ad4b30040f9d870a369e5a9 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 27 Dec 2009 17:19:56 +0000
Subject: [PATCH] when opening a message for display or edit, use its notion of
 account, not the folder's.

---
 src/com/fsck/k9/activity/MessageList.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index c1e973ead..c72e6d50d 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -672,7 +672,7 @@ public class MessageList
     {
         if (mAccount != null && message.folder.name.equals(message.account.getDraftsFolderName()))
         {
-            MessageCompose.actionEditDraft(this, mAccount, message.message);
+            MessageCompose.actionEditDraft(this, message.account, message.message);
         }
         else
         {
@@ -684,7 +684,7 @@ public class MessageList
                 messageUids.add(holder.uid);
             }
 
-            MessageView.actionView(this, mAccount, message.folder.name, message.uid, messageUids);
+            MessageView.actionView(this, message.account, message.folder.name, message.uid, messageUids);
         }
         /*
         * We set read=true here for UI performance reasons. The actual value will