Merge "Fix reply/forward to start the compose activity"
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index e271503..f9efa1c 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -208,7 +208,7 @@
         mWebView.loadDataWithBaseURL(mBaseUri, renderMessageBodies(messageCursor), "text/html",
                 "utf-8", null);
         mConversationContainer.setOverlayAdapter(
-                new MessageListAdapter(mContext, messageCursor, mAccount));
+                new MessageListAdapter(mActivity.getActivityContext(), messageCursor, mAccount));
     }
 
     @Override