From 16a60dca84516a1338e3cfe7f868c94f3f97c536 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Fri, 16 Jul 2010 15:10:00 -0700
Subject: [PATCH] Fragmentize MessageView.

This version is hybrid of the old design and what Andy's suggested.
- MessageViewFragment is responsible to show a single message at a time.
- Call MVF.openMessage() to tell it to open another message.
  No need to re-create a new MVF to do this.
- MessageView manages the message list, and handles "move-to-newer/older"
  buttons.

Reason for not re-creating a fragment when opening another message is:
- Re-using the same fragment doesn't make it as complecated/ugly as I
  was initially afraid.
  It's basically cancelling all running tasks, re-initializee some views,
  and load a message.
- We don't have to run MVF.onCreate() over and over again when moving through
  messages.
We may change the strategy later, but I think it's suffice for now.
(Changing this might affect how the back key works, so let's revisit it
when the fragment manager supports back.)

Basically this CL is all about internal changes.
No UI should have changed except for:
- Moved "Move to newer/older" buttons to the bottom.

Also fixes:
Bug: 2849129

Change-Id: I00c05069231afded9d98d3d52dd9a7925ebdee9d
---
 res/layout-land/message_view.xml              |   80 --
 res/layout/message_view.xml                   |   72 +-
 res/layout/message_view_header.xml            |  352 ++---
 res/values/strings.xml                        |   41 +-
 .../android/email/activity/MediaOpener.java   |   86 ++
 .../android/email/activity/MessageView.java   | 1276 +++--------------
 .../email/activity/MessageViewFragment.java   | 1166 +++++++++++++++
 7 files changed, 1663 insertions(+), 1410 deletions(-)
 delete mode 100644 res/layout-land/message_view.xml
 create mode 100644 src/com/android/email/activity/MediaOpener.java
 create mode 100644 src/com/android/email/activity/MessageViewFragment.java

diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
deleted file mode 100644
index 18584473c..000000000
--- a/res/layout-land/message_view.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white">
-    <ScrollView
-        android:id="@+id/scrollview"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:scrollbarStyle="outsideInset"
-        android:fadingEdge="none">
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1">
-            <!-- put invisible views for prev/next in order to not special-case the lanscape in code -->
-            <FrameLayout
-                 android:visibility="gone"
-                 android:layout_width="0dip"
-                 android:layout_height="0dip">
-                <View 
-                     android:id="@+id/moveToNewer"
-                     android:layout_width="0dip"
-                     android:layout_height="0dip" />
-                <View android:id="@+id/moveToOlder"
-                      android:layout_width="0dip"
-                      android:layout_height="0dip" />
-            </FrameLayout>
-            <include layout="@layout/message_view_header" />
-
-        </LinearLayout>
-    </ScrollView>
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:paddingBottom="1dip"    
-        android:background="@android:drawable/bottom_bar">
-        <Button
-            android:id="@+id/reply"
-            android:text="@string/reply_action"
-            android:layout_height="match_parent"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/reply_all"
-            android:text="@string/reply_all_action"
-            android:layout_height="match_parent"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/delete"
-            android:text="@string/delete_action"
-            android:layout_height="match_parent"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index ae7bb4973..3e236de66 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,58 +20,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white">
-    <ScrollView
-        android:id="@+id/scrollview"
+    <fragment
+        android:id="@+id/message_view_fragment"
+        android:name="com.android.email.activity.MessageViewFragment"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:scrollbarStyle="outsideOverlay"
-        android:fadingEdge="none"
-        android:fillViewport="true">
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <!-- Note, height is 2+35+0.  There is a 4pixel fade on top of header image -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="37dip"
-                android:paddingTop="2dip"
-                android:background="#101010">
-                <ImageButton
-                    android:id="@+id/moveToNewer"
-                    android:layout_height="35dip"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    android:src="@drawable/btn_arrow_left"
-                    android:scaleType="fitStart" 
-                    android:paddingLeft="6dip"
-                    android:background="@drawable/btn_arrow_background"
-                    android:paddingTop="0dip"
-                    android:paddingBottom="0dip"
-                     />
-                <ImageButton
-                    android:id="@+id/moveToOlder"
-                    android:layout_height="35dip"
-                    android:layout_width="0dip"
-                    android:layout_weight="1"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentTop="true" 
-                    android:src="@drawable/btn_arrow_right"
-                    android:scaleType="fitEnd"
-                    android:paddingRight="9dip"
-                    android:background="@drawable/btn_arrow_background"
-                    android:paddingTop="0dip"
-                    android:paddingBottom="0dip" 
-                     />
-            </LinearLayout>
-
-            <include layout="@layout/message_view_header" />
-
-        </LinearLayout>
-    </ScrollView>
+        />
+    <!-- Bottom buttons -->
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -79,7 +35,7 @@
         android:paddingTop="5dip"
         android:paddingLeft="4dip"
         android:paddingRight="4dip"
-        android:paddingBottom="1dip"    
+        android:paddingBottom="1dip"
         android:background="@android:drawable/bottom_bar">
         <Button
             android:id="@+id/reply"
@@ -99,5 +55,17 @@
             android:layout_height="match_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
+        <Button
+            android:id="@+id/moveToNewer"
+            android:text="@string/message_view_move_to_newer"
+            android:layout_height="match_parent"
+            android:layout_width="0dip"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/moveToOlder"
+            android:text="@string/message_view_move_to_older"
+            android:layout_height="match_parent"
+            android:layout_width="0dip"
+            android:layout_weight="1" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index bb7b592aa..75f72eef2 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,171 +14,191 @@
      limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- header area -->
+<!--
+    TODO Rename to message_view_fragment.xml
+    Can't do it now because git wouldn't detect renaming.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollview"
+    android:layout_width="match_parent"
+    android:layout_height="0dip"
+    android:scrollbarStyle="outsideOverlay"
+    android:fadingEdge="none"
+    android:fillViewport="true"
+    >
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@drawable/header_card"
-        android:paddingTop="3dip"
-        android:paddingBottom="3dip"
-        android:paddingLeft="3dip"
-        android:paddingRight="6dip">
-        <LinearLayout
-            android:id="@+id/from_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAligned="true" >
-            <ImageView
-                android:id="@+id/presence"
-                android:src="@drawable/presence_inactive"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="5dip"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/quickcontact_presence_bg" />
-            <TextView
-                android:id="@+id/from"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:textColor="?android:attr/textColorPrimaryInverse"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:paddingRight="6dip" />
-            <ImageView
-                android:id="@+id/attachment"
-                android:src="@drawable/ic_email_attachment_small"
-                android:layout_width="22dip"
-                android:layout_height="22dip"
-                android:baselineAlignBottom="true" />
-            <TextView
-                android:id="@+id/date"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="true" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/to_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_view_to_label" />
-            <TextView
-                android:id="@+id/to"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="false"
-                android:ellipsize="none" />
-            <TextView
-                android:id="@+id/time"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="true" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/cc_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_view_cc_label" />
-            <TextView
-                android:id="@+id/cc"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="false"
-                android:ellipsize="none" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:id="@+id/subject"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
-                android:textStyle="bold"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:singleLine="false"
-                android:ellipsize="none" />
-            <!-- TODO: Move this to wherever it really belongs -->
-            <ImageView
-                android:id="@+id/favorite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:src="@drawable/btn_star_big_buttonless_off" />
-                </LinearLayout>
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/show_pictures_section"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#ffefefef"
-        android:layout_marginTop="6dip"
-        android:paddingLeft="6dip"
-        android:paddingRight="3dip"
-        android:paddingTop="4dip"
-        android:paddingBottom="4dip"
-        android:baselineAligned="false"
-        android:visibility="gone">
-        <TextView
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondaryInverse"
-            android:text="@string/message_view_show_pictures_instructions"
-            android:layout_gravity="center"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1.0" />
-        <Button
-            android:id="@+id/show_pictures"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/message_view_show_pictures_action" />
-    </LinearLayout>
-    <!-- content area -->
-    <include layout="@layout/message_view_invitation" />
-    <WebView
-        android:id="@+id/message_content"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="#ffffff" />
-    <!-- attachments area -->
-    <LinearLayout
-        android:id="@+id/attachments"
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="4dip"
-        android:background="#ffffff">
+        android:layout_height="match_parent"
+        >
+        <!-- header area -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@drawable/header_card"
+            android:paddingTop="3dip"
+            android:paddingBottom="3dip"
+            android:paddingLeft="3dip"
+            android:paddingRight="6dip">
+            <LinearLayout
+                android:id="@+id/from_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="true" >
+                <ImageView
+                    android:id="@+id/presence"
+                    android:src="@drawable/presence_inactive"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dip"
+                    android:layout_gravity="center_vertical"
+                    android:background="@drawable/quickcontact_presence_bg" />
+                <TextView
+                    android:id="@+id/from"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textStyle="bold"
+                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:layout_width="0dip"
+                    android:layout_weight="1.0"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:paddingRight="6dip" />
+                <ImageView
+                    android:id="@+id/attachment"
+                    android:src="@drawable/ic_email_attachment_small"
+                    android:layout_width="22dip"
+                    android:layout_height="22dip"
+                    android:baselineAlignBottom="true" />
+                <TextView
+                    android:id="@+id/date"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dip"
+                    android:singleLine="true" />
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/to_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <TextView
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textStyle="bold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/message_view_to_label" />
+                <TextView
+                    android:id="@+id/to"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:layout_width="0dip"
+                    android:layout_weight="1.0"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dip"
+                    android:singleLine="false"
+                    android:ellipsize="none" />
+                <TextView
+                    android:id="@+id/time"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dip"
+                    android:singleLine="true" />
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/cc_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <TextView
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textStyle="bold"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/message_view_cc_label" />
+                <TextView
+                    android:id="@+id/cc"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:layout_width="0dip"
+                    android:layout_weight="1.0"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dip"
+                    android:singleLine="false"
+                    android:ellipsize="none" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <TextView
+                    android:id="@+id/subject"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textStyle="bold"
+                    android:layout_width="0dip"
+                    android:layout_weight="1.0"
+                    android:layout_height="wrap_content"
+                    android:singleLine="false"
+                    android:ellipsize="none" />
+                <!-- TODO: Move this to wherever it really belongs -->
+                <ImageView
+                    android:id="@+id/favorite"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:src="@drawable/btn_star_big_buttonless_off" />
+                    </LinearLayout>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/show_pictures_section"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#ffefefef"
+            android:layout_marginTop="6dip"
+            android:paddingLeft="6dip"
+            android:paddingRight="3dip"
+            android:paddingTop="4dip"
+            android:paddingBottom="4dip"
+            android:baselineAligned="false"
+            android:visibility="gone">
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:text="@string/message_view_show_pictures_instructions"
+                android:layout_gravity="center"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0" />
+            <Button
+                android:id="@+id/show_pictures"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/message_view_show_pictures_action" />
+        </LinearLayout>
+        <!-- content area -->
+        <include layout="@layout/message_view_invitation" />
+        <WebView
+            android:id="@+id/message_content"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:background="#ffffff" />
+        <!-- attachments area -->
+        <LinearLayout
+            android:id="@+id/attachments"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="4dip"
+            android:background="#ffffff">
+        </LinearLayout>
     </LinearLayout>
-</merge>
+</ScrollView>
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b418454b..6add7fa1b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@
     <!-- Do Not Translate.  Unused string. -->
     <string name="account_setup_failed_security_policies_required"></string>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="account_folder_list_summary_unread"></string>    
+    <string name="account_folder_list_summary_unread"></string>
     <!-- Do Not Translate.  Unused string. -->
     <string name="account_settings_add_account_label"></string>
     <!-- Do Not Translate.  Unused string. -->
@@ -69,11 +69,11 @@
 
     <!-- Actions will be used as buttons and in menu items -->
     <skip />
-    
+
     <!-- Used as part of a multi-step process -->
-    <string name="next_action">Next</string> 
+    <string name="next_action">Next</string>
     <!--  Button name used to confirm acceptance of dialog boxes, warnings, errors, etc. -->
-    <string name="okay_action">OK</string> 
+    <string name="okay_action">OK</string>
     <!--  Button name used to cancel out of dialog boxes -->
     <string name="cancel_action">Cancel</string>
     <!-- Menu item/button name -->
@@ -87,7 +87,7 @@
     <!-- Menu item/button name -->
     <string name="forward_action">Forward</string>
     <!--  Button name used to complete a multi-step process -->
-    <string name="done_action">Done</string> 
+    <string name="done_action">Done</string>
     <!-- Menu item/button name -->
     <string name="discard_action">Discard</string>
     <!-- Menu item/button name -->
@@ -153,10 +153,10 @@
          one or more new messages; e.g, "279 unread (someone@google.com)". -->
     <plurals name="notification_new_one_account_fmt">
         <!-- Case of one new message. -->
-        <item quantity="one"><xliff:g id="unread_message_count" example="1">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item> 
+        <item quantity="one"><xliff:g id="unread_message_count" example="1">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
 
         <!-- Case of "few" (small number of) new messages. -->
-        <item quantity="few"><xliff:g id="unread_message_count" example="2">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item> 
+        <item quantity="few"><xliff:g id="unread_message_count" example="2">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
 
         <!-- Case of a plural number of new messages. -->
         <item quantity="other"><xliff:g id="unread_message_count" example="279">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
@@ -240,7 +240,7 @@
     <!-- Hint text in Subject field -->
     <string name="message_compose_subject_hint">Subject</string>
     <!-- Hint text in Message composer body field -->
-    <string name="message_compose_body_hint">Compose Mail</string>    
+    <string name="message_compose_body_hint">Compose Mail</string>
     <!-- Header for forwarded original messages -->
     <string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%1$s</xliff:g>\nFrom: <xliff:g id="sender">%2$s</xliff:g>\nTo: <xliff:g id="to">%3$s</xliff:g>\nCC: <xliff:g id="cc">%4$s</xliff:g>\n\n</string>
     <!-- Header for replied-to messages -->
@@ -332,6 +332,11 @@
         <item quantity="other"><xliff:g id="size_in_gigabytes" example="279">%d</xliff:g>GB</item>
     </plurals>
 
+    <!-- Do Not Translate.  The label of the next button on the message view screen. -->
+    <string name="message_view_move_to_newer">&lt;</string>
+    <!-- Do Not Translate.  The label of the previous button on the message view screen. -->
+    <string name="message_view_move_to_older">&gt;</string>
+
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>
     <!-- Title of the screen when adding exchange account -->
@@ -437,7 +442,7 @@
     <string name="account_setup_incoming_delete_policy_never_label">Never</string>
     <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
     <string name="account_setup_incoming_delete_policy_delete_label">When I delete from Inbox</string>
-    
+
     <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
     <string name="account_setup_incoming_imap_path_prefix_label">IMAP path prefix</string>
     <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
@@ -456,7 +461,7 @@
     <string name="account_setup_outgoing_username_label">Username</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
     <string name="account_setup_outgoing_password_label">Password</string>
-    
+
     <!-- Title of "Exchange server settings" screen -->
     <string name="account_setup_exchange_title">Server settings</string>
     <!-- On "Exchange" setup screen, the name of the server -->
@@ -515,19 +520,19 @@
     <string name="account_setup_options_mail_window_1month">One month</string>
 
     <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
-    <string name="account_setup_failed_dlg_auth_message">Username or password incorrect.</string> 
+    <string name="account_setup_failed_dlg_auth_message">Username or password incorrect.</string>
     <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect\n(ERR01 Account does not exist) -->
-    <string name="account_setup_failed_dlg_auth_message_fmt">Username or password incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string> 
+    <string name="account_setup_failed_dlg_auth_message_fmt">Username or password incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string>
 
     <!-- "Setup could not finish" dialog text; e.g., Cannot safely connect to server -->
-    <string name="account_setup_failed_dlg_certificate_message">Cannot safely connect to server.</string> 
+    <string name="account_setup_failed_dlg_certificate_message">Cannot safely connect to server.</string>
     <!-- "Setup could not finish" dialog text; e.g., Cannot safely connect to server\n(TLS Not Supported) -->
-    <string name="account_setup_failed_dlg_certificate_message_fmt">Cannot safely connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> 
+    <string name="account_setup_failed_dlg_certificate_message_fmt">Cannot safely connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string>
 
     <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
-    <string name="account_setup_failed_dlg_server_message">Cannot connect to server.</string> 
+    <string name="account_setup_failed_dlg_server_message">Cannot connect to server.</string>
     <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
-    <string name="account_setup_failed_dlg_server_message_fmt">Cannot connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string> 
+    <string name="account_setup_failed_dlg_server_message_fmt">Cannot connect to server.\n(<xliff:g id="error">%s</xliff:g>)</string>
 
     <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
     <string name="account_setup_failed_tls_required">TLS required but not supported by server.</string>
diff --git a/src/com/android/email/activity/MediaOpener.java b/src/com/android/email/activity/MediaOpener.java
new file mode 100644
index 000000000..f66f4383d
--- /dev/null
+++ b/src/com/android/email/activity/MediaOpener.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email.activity;
+
+import com.android.email.R;
+import com.android.email.Utility;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.media.MediaScannerConnection;
+import android.media.MediaScannerConnection.MediaScannerConnectionClient;
+import android.net.Uri;
+
+import java.io.File;
+
+/**
+ * Call to pass a media file to the media scanner service and open it when scanned.
+ *
+ * TODO We maight want to set FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when starting intent, as its
+ * javadoc suggest. (But seems like Gmail doesn't do that either.)
+ */
+public class MediaOpener {
+    private final Activity mActivity;
+    private final MediaScannerConnection mConnection;
+    private final File mFile;
+
+    private MediaOpener(Activity activity, File file) {
+        mActivity = activity;
+        mFile = file;
+        mConnection = new MediaScannerConnection(mActivity.getApplicationContext(),
+                new MediaScannerConnectionClient() {
+            @Override
+            public void onMediaScannerConnected() {
+                mConnection.scanFile(mFile.getAbsolutePath(), null);
+            }
+
+            @Override
+            public void onScanCompleted(String path, Uri uri) {
+                MediaOpener.this.onScanCompleted(path, uri);
+            }
+        });
+    }
+
+    private void start() {
+        mConnection.connect();
+    }
+
+    private void onScanCompleted(String path, Uri uri) {
+        try {
+            if (uri != null) {
+                mActivity.startActivity(new Intent(Intent.ACTION_VIEW, uri));
+            }
+        } catch (ActivityNotFoundException e) {
+            Utility.showToast(mActivity, R.string.message_view_display_attachment_toast);
+            // TODO: Add a proper warning message (and lots of upstream cleanup to prevent
+            // it from happening)
+        } finally {
+            mConnection.disconnect();
+        }
+    }
+
+    /**
+     * Start scanning a file and opening it when scanned.
+     *
+     * @param activity activity used as a parent when starting an intent.
+     * @param file file to open.
+     */
+    public static void scanAndOpen(Activity activity, File file) {
+        new MediaOpener(activity, file).start();
+    }
+}
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 86a285ef6..215903c0f 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -17,71 +17,27 @@
 package com.android.email.activity;
 
 import com.android.email.Controller;
-import com.android.email.ControllerResultUiThreadWrapper;
 import com.android.email.Email;
 import com.android.email.R;
 import com.android.email.Utility;
-import com.android.email.mail.Address;
-import com.android.email.mail.MeetingInfo;
-import com.android.email.mail.MessagingException;
-import com.android.email.mail.PackedString;
-import com.android.email.mail.internet.EmailHtmlUtil;
-import com.android.email.mail.internet.MimeUtility;
-import com.android.email.provider.AttachmentProvider;
-import com.android.email.provider.EmailContent.Attachment;
-import com.android.email.provider.EmailContent.Body;
-import com.android.email.provider.EmailContent.Message;
-import com.android.email.service.EmailServiceConstants;
-
-import org.apache.commons.io.IOUtils;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
-import android.media.MediaScannerConnection;
-import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
 import android.provider.Browser;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.QuickContact;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.Patterns;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+// TODO Spin-off a new activity for EML files.
 
-public class MessageView extends Activity implements OnClickListener, MessageOrderManager.Callback {
+public class MessageView extends Activity implements OnClickListener, MessageOrderManager.Callback,
+        MessageViewFragment.Callback {
     private static final String EXTRA_MESSAGE_ID = "com.android.email.MessageView_message_id";
     private static final String EXTRA_MAILBOX_ID = "com.android.email.MessageView_mailbox_id";
     /* package */ static final String EXTRA_DISABLE_REPLY =
@@ -90,36 +46,8 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
     // for saveInstanceState()
     private static final String STATE_MESSAGE_ID = "messageId";
 
-    // Regex that matches start of img tag. '<(?i)img\s+'.
-    private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");
-    // Regex that matches Web URL protocol part as case insensitive.
-    private static final Pattern WEB_URL_PROTOCOL = Pattern.compile("(?i)http|https://");
-
-    private static int PREVIEW_ICON_WIDTH = 62;
-    private static int PREVIEW_ICON_HEIGHT = 62;
-
-    private TextView mSubjectView;
-    private TextView mFromView;
-    private TextView mDateView;
-    private TextView mTimeView;
-    private TextView mToView;
-    private TextView mCcView;
-    private View mCcContainerView;
-    private WebView mMessageContentView;
-    private LinearLayout mAttachments;
-    private ImageView mAttachmentIcon;
-    private ImageView mFavoriteIcon;
-    private View mShowPicturesSection;
-    private View mInviteSection;
-    private ImageView mSenderPresenceView;
-    private ProgressDialog mProgressDialog;
-    private View mScrollView;
-
-    // calendar meeting invite answers
-    private TextView mMeetingYes;
-    private TextView mMeetingMaybe;
-    private TextView mMeetingNo;
-    private int mPreviousMeetingResponse = -1;
+    private ProgressDialog mFetchAttachmentProgressDialog;
+    private MessageViewFragment mMessageViewFragment;
 
     /**
      * If set, URI to the email (i.e. *.eml files, and possibly *.msg files) file that's being
@@ -133,57 +61,19 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
      * Do this after making it into a fragment.
      */
     private Uri mFileEmailUri;
-    private long mAccountId;
     private long mMessageId;
     private long mMailboxId;
-    private Message mMessage;
-
-    private LoadMessageTask mLoadMessageTask;
-    private LoadBodyTask mLoadBodyTask;
-    private LoadAttachmentsTask mLoadAttachmentsTask;
-    private PresenceUpdater mPresenceUpdater;
 
     private MessageOrderManager mOrderManager;
 
-    private long mLoadAttachmentId;         // the attachment being saved/viewed
-    private boolean mLoadAttachmentSave;    // if true, saving - if false, viewing
-    private String mLoadAttachmentName;     // the display name
-
-    private java.text.DateFormat mDateFormat;
-    private java.text.DateFormat mTimeFormat;
-
-    private Drawable mFavoriteIconOn;
-    private Drawable mFavoriteIconOff;
-
     private Controller mController;
-    private ControllerResultUiThreadWrapper<ControllerResults> mControllerCallback;
 
     private View mMoveToNewer;
     private View mMoveToOlder;
 
-    // contains the HTML body. Is used by LoadAttachmentTask to display inline images.
-    // is null most of the time, is used transiently to pass info to LoadAttachementTask
-    private String mHtmlTextRaw;
-
-    // contains the HTML content as set in WebView.
-    private String mHtmlTextWebView;
-
     // this is true when reply & forward are disabled, such as messages in the trash
     private boolean mDisableReplyAndForward;
 
-   /**
-     * Encapsulates known information about a single attachment.
-     */
-    private static class AttachmentInfo {
-        public String name;
-        public String contentType;
-        public long size;
-        public long attachmentId;
-        public Button viewButton;
-        public Button downloadButton;
-        public ImageView iconView;
-    }
-
     /**
      * View a specific message found in the Email provider.
      * @param messageId the message to view.
@@ -212,61 +102,23 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         super.onCreate(icicle);
         setContentView(R.layout.message_view);
 
-        mControllerCallback = new ControllerResultUiThreadWrapper<ControllerResults>(
-                new Handler(), new ControllerResults());
-        mPresenceUpdater = new PresenceUpdater(this);
+        mMessageViewFragment = (MessageViewFragment) findFragmentById(R.id.message_view_fragment);
+        mMessageViewFragment.setCallback(this);
 
-        mSubjectView = (TextView) findViewById(R.id.subject);
-        mFromView = (TextView) findViewById(R.id.from);
-        mToView = (TextView) findViewById(R.id.to);
-        mCcView = (TextView) findViewById(R.id.cc);
-        mCcContainerView = findViewById(R.id.cc_container);
-        mDateView = (TextView) findViewById(R.id.date);
-        mTimeView = (TextView) findViewById(R.id.time);
-        mMessageContentView = (WebView) findViewById(R.id.message_content);
-        mAttachments = (LinearLayout) findViewById(R.id.attachments);
-        mAttachmentIcon = (ImageView) findViewById(R.id.attachment);
-        mFavoriteIcon = (ImageView) findViewById(R.id.favorite);
-        mShowPicturesSection = findViewById(R.id.show_pictures_section);
-        mInviteSection = findViewById(R.id.invite_section);
-        mSenderPresenceView = (ImageView) findViewById(R.id.presence);
         mMoveToNewer = findViewById(R.id.moveToNewer);
         mMoveToOlder = findViewById(R.id.moveToOlder);
-        mScrollView = findViewById(R.id.scrollview);
-
         mMoveToNewer.setOnClickListener(this);
         mMoveToOlder.setOnClickListener(this);
-        mFromView.setOnClickListener(this);
-        mSenderPresenceView.setOnClickListener(this);
-        mFavoriteIcon.setOnClickListener(this);
+
         findViewById(R.id.reply).setOnClickListener(this);
         findViewById(R.id.reply_all).setOnClickListener(this);
         findViewById(R.id.delete).setOnClickListener(this);
-        findViewById(R.id.show_pictures).setOnClickListener(this);
 
-        mMeetingYes = (TextView) findViewById(R.id.accept);
-        mMeetingMaybe = (TextView) findViewById(R.id.maybe);
-        mMeetingNo = (TextView) findViewById(R.id.decline);
-
-        mMeetingYes.setOnClickListener(this);
-        mMeetingMaybe.setOnClickListener(this);
-        mMeetingNo.setOnClickListener(this);
-        findViewById(R.id.invite_link).setOnClickListener(this);
-
-        mMessageContentView.setVerticalScrollBarEnabled(false);
-        mMessageContentView.getSettings().setBlockNetworkLoads(true);
-        mMessageContentView.getSettings().setSupportZoom(false);
-        mMessageContentView.setWebViewClient(new CustomWebViewClient());
-
-        mProgressDialog = new ProgressDialog(this);
-        mProgressDialog.setIndeterminate(true);
-        mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-
-        mDateFormat = android.text.format.DateFormat.getDateFormat(this);   // short format
-        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);   // 12/24 date format
-
-        mFavoriteIconOn = getResources().getDrawable(R.drawable.btn_star_big_buttonless_on);
-        mFavoriteIconOff = getResources().getDrawable(R.drawable.btn_star_big_buttonless_off);
+        // TODO Turn it into a "managed" dialog?
+        // Managed dialogs survive activity re-creation.  (e.g. orientation change)
+        mFetchAttachmentProgressDialog = new ProgressDialog(this);
+        mFetchAttachmentProgressDialog.setIndeterminate(true);
+        mFetchAttachmentProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
 
         initFromIntent();
         if (icicle != null) {
@@ -274,7 +126,6 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         }
 
         mController = Controller.getInstance(getApplication());
-        messageChanged();
     }
 
     /* package */ void initFromIntent() {
@@ -311,26 +162,21 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
     @Override
     public void onResume() {
         super.onResume();
-        mController.addResultCallback(mControllerCallback);
 
-        // Exit immediately if the accounts list has changed (e.g. externally deleted)
-        if (Email.getNotifyUiAccountsChanged()) {
-            Welcome.actionStart(this);
-            finish();
-            return;
-        }
-
-        if (mMessage != null) {
-            startPresenceCheck();
-        }
         if (!isViewingEmailFile()) {
+            // Exit immediately if the accounts list has changed (e.g. externally deleted)
+            if (Email.getNotifyUiAccountsChanged()) {
+                Welcome.actionStart(this);
+                finish();
+                return;
+            }
             mOrderManager = new MessageOrderManager(this, mMailboxId, this);
         }
+        messageChanged();
     }
 
     @Override
     public void onPause() {
-        mController.removeResultCallback(mControllerCallback);
         if (mOrderManager != null) {
             mOrderManager.close();
             mOrderManager = null;
@@ -338,36 +184,16 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         super.onPause();
     }
 
-    private void cancelAllTasks() {
-        Utility.cancelTaskInterrupt(mLoadMessageTask);
-        mLoadMessageTask = null;
-        Utility.cancelTaskInterrupt(mLoadBodyTask);
-        mLoadBodyTask = null;
-        Utility.cancelTaskInterrupt(mLoadAttachmentsTask);
-        mLoadAttachmentsTask = null;
-        mPresenceUpdater.cancelAll();
-    }
-
     /**
      * We override onDestroy to make sure that the WebView gets explicitly destroyed.
      * Otherwise it can leak native references.
      */
     @Override
     public void onDestroy() {
-        if (mOrderManager != null) {
-            mOrderManager.close();
-        }
-        cancelAllTasks();
-        mMessageContentView.destroy();
-        mMessageContentView = null;
-        // the cursor was closed in onPause()
-        // If we're leaving a non-attachment message, delete any/all attachment messages
-        if (!isViewingEmailFile()) {
-            mController.deleteAttachmentMessages();
-        }
         super.onDestroy();
     }
 
+    // TODO Make EML specific activity, and this will be gone.
     /**
      * @return true if viewing an email file.  (i.e. *.eml files)
      */
@@ -376,149 +202,83 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
     }
 
     /**
-     * Overrides for various WebView behaviors.
+     * {@inheritDoc}
+     *
+     * This is intended to mirror the operation of the original
+     * (see android.webkit.CallbackProxy) with one addition of intent flags
+     * "FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET".  This improves behavior when sublaunching
+     * other apps via embedded URI's.
+     *
+     * We also use this hook to catch "mailto:" links and handle them locally.
      */
-    private class CustomWebViewClient extends WebViewClient {
-        /**
-         * This is intended to mirror the operation of the original
-         * (see android.webkit.CallbackProxy) with one addition of intent flags
-         * "FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET".  This improves behavior when sublaunching
-         * other apps via embedded URI's.
-         *
-         * We also use this hook to catch "mailto:" links and handle them locally.
-         */
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            // hijack mailto: uri's and handle locally
-            if (url != null && url.toLowerCase().startsWith("mailto:")) {
-                return MessageCompose.actionCompose(MessageView.this, url, mAccountId);
-            }
+    @Override
+    public boolean onUrlInMessageClicked(String url) {
+        // hijack mailto: uri's and handle locally
+        if (url != null && url.toLowerCase().startsWith("mailto:")) {
+            // If it's showing an EML file, there might be no accounts, but then MessageCompose
+            // should close itself.
+            long senderAccountId = isViewingEmailFile() ? -1 : mMessageViewFragment.getAccountId();
 
-            // Handle most uri's via intent launch
-            boolean result = false;
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-            intent.addCategory(Intent.CATEGORY_BROWSABLE);
-            intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-            try {
-                startActivity(intent);
-                result = true;
-            } catch (ActivityNotFoundException ex) {
-                // If no application can handle the URL, assume that the
-                // caller can handle it.
-            }
-            return result;
+            // TODO if MessageCompose implements the account selector, we'll be able to just pass -1
+            // as the account id.
+            return MessageCompose.actionCompose(MessageView.this, url, senderAccountId);
         }
-    }
-
-    /**
-     * Handle clicks on sender, which shows {@link QuickContact} or prompts to add
-     * the sender as a contact.
-     */
-    private void onClickSender() {
-        // Bail early if message or sender not present
-        if (mMessage == null) return;
-
-        final Address senderEmail = Address.unpackFirst(mMessage.mFrom);
-        if (senderEmail == null) return;
-
-        // First perform lookup query to find existing contact
-        final ContentResolver resolver = getContentResolver();
-        final String address = senderEmail.getAddress();
-        final Uri dataUri = Uri.withAppendedPath(CommonDataKinds.Email.CONTENT_FILTER_URI,
-                Uri.encode(address));
-        final Uri lookupUri = ContactsContract.Data.getContactLookupUri(resolver, dataUri);
-
-        if (lookupUri != null) {
-            // Found matching contact, trigger QuickContact
-            QuickContact.showQuickContact(this, mSenderPresenceView, lookupUri,
-                    QuickContact.MODE_LARGE, null);
-        } else {
-            // No matching contact, ask user to create one
-            final Uri mailUri = Uri.fromParts("mailto", address, null);
-            final Intent intent = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT,
-                    mailUri);
-
-            // Pass along full E-mail string for possible create dialog
-            intent.putExtra(ContactsContract.Intents.EXTRA_CREATE_DESCRIPTION,
-                    senderEmail.toString());
-
-            // Only provide personal name hint if we have one
-            final String senderPersonal = senderEmail.getPersonal();
-            if (!TextUtils.isEmpty(senderPersonal)) {
-                intent.putExtra(ContactsContract.Intents.Insert.NAME, senderPersonal);
-            }
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
 
+        // Handle most uri's via intent launch
+        boolean result = false;
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        intent.addCategory(Intent.CATEGORY_BROWSABLE);
+        intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+        try {
             startActivity(intent);
+            result = true;
+        } catch (ActivityNotFoundException ex) {
+            // No applications can handle it.  Ignore.
         }
-    }
-
-    /**
-     * Toggle favorite status and write back to provider
-     */
-    private void onClickFavorite() {
-        if (isViewingEmailFile()) {
-            return;
-        }
-        if (mMessage != null) {
-            // Update UI
-            boolean newFavorite = ! mMessage.mFlagFavorite;
-            mFavoriteIcon.setImageDrawable(newFavorite ? mFavoriteIconOn : mFavoriteIconOff);
-
-            // Update provider
-            mMessage.mFlagFavorite = newFavorite;
-            mController.setMessageFavorite(mMessageId, newFavorite);
-        }
+        return result;
     }
 
     private void onReply() {
         if (isViewingEmailFile()) {
             return;
         }
-        if (mMessage != null) {
-            MessageCompose.actionReply(this, mMessage.mId, false);
-            finish();
-        }
+        MessageCompose.actionReply(this, mMessageId, false);
+        finish();
     }
 
     private void onReplyAll() {
         if (isViewingEmailFile()) {
             return;
         }
-        if (mMessage != null) {
-            MessageCompose.actionReply(this, mMessage.mId, true);
-            finish();
-        }
+        MessageCompose.actionReply(this, mMessageId, true);
+        finish();
     }
 
     private void onForward() {
         if (isViewingEmailFile()) {
             return;
         }
-        if (mMessage != null) {
-            MessageCompose.actionForward(this, mMessage.mId);
-            finish();
-        }
+        MessageCompose.actionForward(this, mMessageId);
+        finish();
     }
 
     private void onDeleteMessage() {
         if (isViewingEmailFile()) {
             return;
         }
-        if (mMessage != null) {
-            // the delete triggers mCursorObserver
-            // first move to older/newer before the actual delete
-            long messageIdToDelete = mMessageId;
-            boolean moved = moveToOlder() || moveToNewer();
-            mController.deleteMessage(messageIdToDelete, mMessage.mAccountKey);
-            Utility.showToast(this,
-                    getResources().getQuantityString(R.plurals.message_deleted_toast, 1));
-            if (!moved) {
-                // this generates a benign warning "Duplicate finish request" because
-                // repositionMessageListCursor() will fail to reposition and do its own finish()
-                finish();
-            }
+        // the delete triggers mCursorObserver in MessageOrderManager.
+        // first move to older/newer before the actual delete
+        long messageIdToDelete = mMessageId;
+        boolean moved = moveToOlder() || moveToNewer();
+        mController.deleteMessage(messageIdToDelete, -1);
+        Utility.showToast(this,
+                getResources().getQuantityString(R.plurals.message_deleted_toast, 1));
+        if (!moved) {
+            // this generates a benign warning "Duplicate finish request" because
+            // MessageOrderManager detects that the current message is gone, and we finish() it
+            // in the onMessageNotFound() callback.
+            finish();
         }
     }
 
@@ -526,8 +286,6 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         if (isViewingEmailFile()) {
             return false;
         }
-        // Guard with !isLast() because Cursor.moveToNext() returns false even as it moves
-        // from last to after-last.
         if (mOrderManager != null && mOrderManager.moveToOlder()) {
             mMessageId = mOrderManager.getCurrentMessageId();
             messageChanged();
@@ -540,8 +298,6 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         if (isViewingEmailFile()) {
             return false;
         }
-        // Guard with !isFirst() because Cursor.moveToPrev() returns false even as it moves
-        // from first to before-first.
         if (mOrderManager != null && mOrderManager.moveToNewer()) {
             mMessageId = mOrderManager.getCurrentMessageId();
             messageChanged();
@@ -550,85 +306,8 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         return false;
     }
 
-    private void onMarkAsRead(boolean isRead) {
-        if (isViewingEmailFile()) {
-            return;
-        }
-        if (mMessage != null && mMessage.mFlagRead != isRead) {
-            mMessage.mFlagRead = isRead;
-            mController.setMessageRead(mMessageId, isRead);
-        }
-    }
-
-    /**
-     * Send a service message indicating that a meeting invite button has been clicked.
-     */
-    private void onRespondToInvite(int response, int toastResId) {
-        if (isViewingEmailFile()) {
-            return;
-        }
-        // do not send twice in a row the same response
-        if (mPreviousMeetingResponse != response) {
-            mController.sendMeetingResponse(mMessageId, response);
-            mPreviousMeetingResponse = response;
-        }
-        Toast.makeText(this, toastResId, Toast.LENGTH_SHORT).show();
-        if (!moveToOlder()) {
-            finish(); // if this is the last message, move up to message-list.
-        }
-    }
-
-    private void onDownloadAttachment(AttachmentInfo attachment) {
-        if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            /*
-             * Abort early if there's no place to save the attachment. We don't want to spend
-             * the time downloading it and then abort.
-             */
-            Toast.makeText(this,
-                    getString(R.string.message_view_status_attachment_not_saved),
-                    Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        mLoadAttachmentId = attachment.attachmentId;
-        mLoadAttachmentSave = true;
-        mLoadAttachmentName = attachment.name;
-
-        mController.loadAttachment(attachment.attachmentId, mMessageId, mMessage.mMailboxKey,
-                mAccountId);
-    }
-
-    private void onViewAttachment(AttachmentInfo attachment) {
-        mLoadAttachmentId = attachment.attachmentId;
-        mLoadAttachmentSave = false;
-        mLoadAttachmentName = attachment.name;
-
-        mController.loadAttachment(attachment.attachmentId, mMessageId, mMessage.mMailboxKey,
-                mAccountId);
-    }
-
-    private void onShowPicturesInHtml() {
-        if (mMessage != null) {
-            if (mMessageContentView != null) {
-                mMessageContentView.getSettings().setBlockNetworkLoads(false);
-                if (mHtmlTextWebView != null) {
-                    mMessageContentView.loadDataWithBaseURL("email://", mHtmlTextWebView,
-                                                            "text/html", "utf-8", null);
-                }
-            }
-            mShowPicturesSection.setVisibility(View.GONE);
-        }
-    }
-
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.from:
-            case R.id.presence:
-                onClickSender();
-                break;
-            case R.id.favorite:
-                onClickFavorite();
-                break;
             case R.id.reply:
                 onReply();
                 break;
@@ -644,90 +323,52 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
             case R.id.moveToNewer:
                 moveToNewer();
                 break;
-            case R.id.download:
-                onDownloadAttachment((AttachmentInfo) view.getTag());
-                break;
-            case R.id.view:
-                onViewAttachment((AttachmentInfo) view.getTag());
-                break;
-            case R.id.show_pictures:
-                onShowPicturesInHtml();
-                break;
-            case R.id.accept:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_ACCEPTED,
-                         R.string.message_view_invite_toast_yes);
-                break;
-            case R.id.maybe:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_TENTATIVE,
-                         R.string.message_view_invite_toast_maybe);
-                break;
-            case R.id.decline:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_DECLINED,
-                         R.string.message_view_invite_toast_no);
-                break;
-            case R.id.invite_link:
-                onInviteLinkClicked();
-                break;
         }
     }
 
-    private void onInviteLinkClicked() {
-        if (isViewingEmailFile()) {
-            return;
-        }
-        String startTime = new PackedString(mMessage.mMeetingInfo).get(MeetingInfo.MEETING_DTSTART);
-        if (startTime != null) {
-            long epochTimeMillis = Utility.parseEmailDateTimeToMillis(startTime);
-            Uri uri = Uri.parse("content://com.android.calendar/time/" + epochTimeMillis);
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(uri);
-            intent.putExtra("VIEW", "DAY");
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-            startActivity(intent);
-        } else {
-            Email.log("meetingInfo without DTSTART " + mMessage.mMeetingInfo);
-        }
-    }
-
-   @Override
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-       boolean handled = handleMenuItem(item.getItemId());
-       if (!handled) {
-           handled = super.onOptionsItemSelected(item);
-       }
-       return handled;
-   }
+        boolean handled = handleMenuItem(item.getItemId());
+        if (!handled) {
+            handled = super.onOptionsItemSelected(item);
+        }
+        return handled;
+    }
 
-   /**
-    * This is the core functionality of onOptionsItemSelected() but broken out and exposed
-    * for testing purposes (because it's annoying to mock a MenuItem).
-    *
-    * @param menuItemId id that was clicked
-    * @return true if handled here
-    */
-   /* package */ boolean handleMenuItem(int menuItemId) {
-       switch (menuItemId) {
-           case R.id.delete:
-               onDeleteMessage();
-               break;
-           case R.id.reply:
-               onReply();
-               break;
-           case R.id.reply_all:
-               onReplyAll();
-               break;
-           case R.id.forward:
-               onForward();
-               break;
-           case R.id.mark_as_unread:
-               onMarkAsRead(false);
-               finish();
-               break;
-           default:
-               return false;
-       }
-       return true;
-   }
+    /**
+     * This is the core functionality of onOptionsItemSelected() but broken out and exposed
+     * for testing purposes (because it's annoying to mock a MenuItem).
+     *
+     * @param menuItemId id that was clicked
+     * @return true if handled here
+     */
+    /* package */ boolean handleMenuItem(int menuItemId) {
+        switch (menuItemId) {
+            case R.id.delete:
+                onDeleteMessage();
+                break;
+            case R.id.reply:
+                onReply();
+                break;
+            case R.id.reply_all:
+                onReplyAll();
+                break;
+            case R.id.forward:
+                onForward();
+                break;
+            case R.id.mark_as_unread:
+                mMessageViewFragment.onMarkMessageAsRead(false);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onMessageSetUnread() {
+        finish();
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -744,27 +385,18 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
         return true;
     }
 
-    /**
-     * Re-init everything needed for changing message.
-     */
+    // TODO This method name and logic are both not too great.  Make it cleaner.
+    // - This method wouldn't be needed for the activity for EML.
+    // - Change it to something like openMessage(long messageId).
     private void messageChanged() {
-        if (Email.DEBUG) {
-            Email.log("MessageView: messageChanged to id=" + mMessageId);
+        if (mFileEmailUri != null) {
+            mMessageViewFragment.openMessage(mFileEmailUri);
+        } else {
+            mMessageViewFragment.openMessage(mMessageId);
+            if (mOrderManager != null) {
+                mOrderManager.moveTo(mMessageId);
+            }
         }
-        cancelAllTasks();
-        setTitle("");
-        if (mMessageContentView != null) {
-            mMessageContentView.scrollTo(0, 0);
-            mMessageContentView.loadUrl("file:///android_asset/empty.html");
-        }
-        mScrollView.scrollTo(0, 0);
-        mAttachments.removeAllViews();
-        mAttachments.setVisibility(View.GONE);
-        mAttachmentIcon.setVisibility(View.GONE);
-
-        // Start an AsyncTask to make a new cursor and load the message
-        mLoadMessageTask = new LoadMessageTask(mFileEmailUri, mMessageId, true);
-        mLoadMessageTask.execute();
         updateNavigationArrows();
     }
 
@@ -772,622 +404,78 @@ public class MessageView extends Activity implements OnClickListener, MessageOrd
      * Update the arrows based on the current position of the older/newer cursor.
      */
     private void updateNavigationArrows() {
-        mMoveToNewer.setVisibility((mOrderManager != null) && mOrderManager.canMoveToNewer()
-                ? View.VISIBLE : View.INVISIBLE);
-        mMoveToOlder.setVisibility((mOrderManager != null) && mOrderManager.canMoveToOlder()
-                ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    private Bitmap getPreviewIcon(AttachmentInfo attachment) {
-        try {
-            return BitmapFactory.decodeStream(
-                    getContentResolver().openInputStream(
-                            AttachmentProvider.getAttachmentThumbnailUri(
-                                    mAccountId, attachment.attachmentId,
-                                    PREVIEW_ICON_WIDTH,
-                                    PREVIEW_ICON_HEIGHT)));
-        } catch (Exception e) {
-            /*
-             * We don't care what happened, we just return null for the preview icon.
-             */
-            return null;
-        }
-    }
-
-    private void updateAttachmentThumbnail(long attachmentId) {
-        for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) {
-            AttachmentInfo attachment = (AttachmentInfo) mAttachments.getChildAt(i).getTag();
-            if (attachment.attachmentId == attachmentId) {
-                Bitmap previewIcon = getPreviewIcon(attachment);
-                if (previewIcon != null) {
-                    attachment.iconView.setImageBitmap(previewIcon);
-                }
-                return;
-            }
-        }
-    }
-
-    /**
-     * Copy data from a cursor-refreshed attachment into the UI.  Called from UI thread.
-     *
-     * @param attachment A single attachment loaded from the provider
-     */
-    private void addAttachment(Attachment attachment) {
-        AttachmentInfo attachmentInfo = new AttachmentInfo();
-        attachmentInfo.size = attachment.mSize;
-        attachmentInfo.contentType =
-                AttachmentProvider.inferMimeType(attachment.mFileName, attachment.mMimeType);
-        attachmentInfo.name = attachment.mFileName;
-        attachmentInfo.attachmentId = attachment.mId;
-
-        LayoutInflater inflater = getLayoutInflater();
-        View view = inflater.inflate(R.layout.message_view_attachment, null);
-
-        TextView attachmentName = (TextView)view.findViewById(R.id.attachment_name);
-        TextView attachmentInfoView = (TextView)view.findViewById(R.id.attachment_info);
-        ImageView attachmentIcon = (ImageView)view.findViewById(R.id.attachment_icon);
-        Button attachmentView = (Button)view.findViewById(R.id.view);
-        Button attachmentDownload = (Button)view.findViewById(R.id.download);
-
-        if ((!MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
-                Email.ACCEPTABLE_ATTACHMENT_VIEW_TYPES))
-                || (MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
-                        Email.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) {
-            attachmentView.setVisibility(View.GONE);
-        }
-        if ((!MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
-                Email.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))
-                || (MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
-                        Email.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))) {
-            attachmentDownload.setVisibility(View.GONE);
-        }
-
-        if (attachmentInfo.size > Email.MAX_ATTACHMENT_DOWNLOAD_SIZE) {
-            attachmentView.setVisibility(View.GONE);
-            attachmentDownload.setVisibility(View.GONE);
-        }
-
-        attachmentInfo.viewButton = attachmentView;
-        attachmentInfo.downloadButton = attachmentDownload;
-        attachmentInfo.iconView = attachmentIcon;
-
-        view.setTag(attachmentInfo);
-        attachmentView.setOnClickListener(this);
-        attachmentView.setTag(attachmentInfo);
-        attachmentDownload.setOnClickListener(this);
-        attachmentDownload.setTag(attachmentInfo);
-
-        attachmentName.setText(attachmentInfo.name);
-        attachmentInfoView.setText(Utility.formatSize(this, attachmentInfo.size));
-
-        Bitmap previewIcon = getPreviewIcon(attachmentInfo);
-        if (previewIcon != null) {
-            attachmentIcon.setImageBitmap(previewIcon);
-        }
-
-        mAttachments.addView(view);
-        mAttachments.setVisibility(View.VISIBLE);
-    }
-
-    /**
-     * Start checking presence of the sender of the message.
-     *
-     * This must only be called when mMessage is null (it will hide presence indications) or when
-     * mMessage has already seen its headers loaded.
-     *
-     * Note:  This is just a polling operation.  A more advanced solution would be to keep the
-     * cursor open and respond to presence status updates (in the form of content change
-     * notifications).  However, because presence changes fairly slowly compared to the duration
-     * of viewing a single message, a simple poll at message load (and onResume) should be
-     * sufficient.
-     */
-    private void startPresenceCheck() {
-        // Set "unknown" presence icon.
-        mSenderPresenceView.setImageResource(PresenceUpdater.getPresenceIconResourceId(null));
-        if (mMessage != null) {
-            Address sender = Address.unpackFirst(mMessage.mFrom);
-            if (sender != null) {
-                String email = sender.getAddress();
-                if (email != null) {
-                    mPresenceUpdater.checkPresence(email, new PresenceUpdater.Callback() {
-                        @Override
-                        public void onPresenceResult(String emailAddress, Integer presenceStatus) {
-                            mSenderPresenceView.setImageResource(
-                                    PresenceUpdater.getPresenceIconResourceId(presenceStatus));
-                        }
-                    });
-                }
-            }
-        }
-    }
-
-    /**
-     * Async task for loading a single message outside of the UI thread
-     */
-    private class LoadMessageTask extends AsyncTask<Void, Void, Message> {
-
-        private final long mId;
-        private final boolean mOkToFetch;
-        private final Uri mFileEmailUri;
-
-        /**
-         * Special constructor to cache some local info
-         */
-        public LoadMessageTask(Uri fileEmailUri, long messageId, boolean okToFetch) {
-            mFileEmailUri = fileEmailUri;
-            mId = messageId;
-            mOkToFetch = okToFetch;
-        }
-
-        /**
-         * There will either be a Uri in the Intent (i.e. whose content is the Message to be
-         * loaded), or mId will be holding the id of the Message as stored in the provider.
-         * If we're loading via Uri, the Controller does the actual message parsing and storage,
-         * and we setup the message id and mailbox id based on the result; forward and reply are
-         * disabled for messages loaded via Uri
-         */
-        @Override
-        protected Message doInBackground(Void... params) {
-            // If we have a URI, then we were opened via an intent filter (e.g. an attachment that
-            // has a mime type that we can handle (e.g. message/rfc822).
-            if (mFileEmailUri != null) {
-                final Activity activity = MessageView.this;
-                // Put up a toast; this can take a little while...
-                Utility.showToast(activity, R.string.message_view_parse_message_toast);
-                Message msg = mController.loadMessageFromUri(mFileEmailUri);
-                if (msg == null) {
-                    // Indicate that the attachment couldn't be loaded
-                    Utility.showToast(activity, R.string.message_view_display_attachment_toast);
-                    return null;
-                }
-                return msg;
-            }
-            return Message.restoreMessageWithId(MessageView.this, mId);
-        }
-
-        @Override
-        protected void onPostExecute(Message message) {
-            /* doInBackground() may return null result (due to restoreMessageWithId())
-             * and in that situation we want to Activity.finish().
-             *
-             * OTOH we don't want to Activity.finish() for isCancelled() because this
-             * would introduce a surprise side-effect to task cancellation: every task
-             * cancelation would also result in finish().
-             *
-             * Right now LoadMesageTask is cancelled not only from onDestroy(),
-             * and it would be a bug to also finish() the activity in that situation.
-             */
-            if (isCancelled()) {
-                return;
-            }
-            if (message == null) {
-                finish();
-                return;
-            }
-            mMessageId = message.mId;
-            mMailboxId = message.mMailboxKey;
-            reloadUiFromMessage(message, mOkToFetch);
-            startPresenceCheck();
-        }
-    }
-
-    /**
-     * Async task for loading a single message body outside of the UI thread
-     */
-    private class LoadBodyTask extends AsyncTask<Void, Void, String[]> {
-
-        private long mId;
-        private boolean mErrorLoadingMessageBody;
-
-        /**
-         * Special constructor to cache some local info
-         */
-        public LoadBodyTask(long messageId) {
-            mId = messageId;
-        }
-
-        @Override
-        protected String[] doInBackground(Void... params) {
-            try {
-                String text = null;
-                String html = Body.restoreBodyHtmlWithMessageId(MessageView.this, mId);
-                if (html == null) {
-                    text = Body.restoreBodyTextWithMessageId(MessageView.this, mId);
-                }
-                return new String[] { text, html };
-            } catch (RuntimeException re) {
-                // This catches SQLiteException as well as other RTE's we've seen from the
-                // database calls, such as IllegalStateException
-                Log.d(Email.LOG_TAG, "Exception while loading message body: " + re.toString());
-                mErrorLoadingMessageBody = true;
-                return new String[] { null, null };
-            }
-        }
-
-        @Override
-        protected void onPostExecute(String[] results) {
-            if (results == null) {
-                if (mErrorLoadingMessageBody) {
-                    Utility.showToast(MessageView.this, R.string.error_loading_message_body);
-                }
-                return;
-            }
-            reloadUiFromBody(results[0], results[1]);    // text, html
-            onMarkAsRead(true);
-        }
-    }
-
-    /**
-     * Async task for loading attachments
-     *
-     * Note:  This really should only be called when the message load is complete - or, we should
-     * leave open a listener so the attachments can fill in as they are discovered.  In either case,
-     * this implementation is incomplete, as it will fail to refresh properly if the message is
-     * partially loaded at this time.
-     */
-    private class LoadAttachmentsTask extends AsyncTask<Long, Void, Attachment[]> {
-        @Override
-        protected Attachment[] doInBackground(Long... messageIds) {
-            return Attachment.restoreAttachmentsWithMessageId(MessageView.this, messageIds[0]);
-        }
-
-        @Override
-        protected void onPostExecute(Attachment[] attachments) {
-            if (attachments == null) {
-                return;
-            }
-            boolean htmlChanged = false;
-            for (Attachment attachment : attachments) {
-                if (mHtmlTextRaw != null && attachment.mContentId != null
-                        && attachment.mContentUri != null) {
-                    // for html body, replace CID for inline images
-                    // Regexp which matches ' src="cid:contentId"'.
-                    String contentIdRe =
-                        "\\s+(?i)src=\"cid(?-i):\\Q" + attachment.mContentId + "\\E\"";
-                    String srcContentUri = " src=\"" + attachment.mContentUri + "\"";
-                    mHtmlTextRaw = mHtmlTextRaw.replaceAll(contentIdRe, srcContentUri);
-                    htmlChanged = true;
-                } else {
-                    addAttachment(attachment);
-                }
-            }
-            mHtmlTextWebView = mHtmlTextRaw;
-            mHtmlTextRaw = null;
-            if (htmlChanged && mMessageContentView != null) {
-                mMessageContentView.loadDataWithBaseURL("email://", mHtmlTextWebView,
-                                                        "text/html", "utf-8", null);
-            }
-        }
-    }
-
-    /**
-     * Reload the UI from a provider cursor.  This must only be called from the UI thread.
-     *
-     * @param message A copy of the message loaded from the database
-     * @param okToFetch If true, and message is not fully loaded, it's OK to fetch from
-     * the network.  Use false to prevent looping here.
-     *
-     * TODO: trigger presence check
-     */
-    private void reloadUiFromMessage(Message message, boolean okToFetch) {
-        mMessage = message;
-        mAccountId = message.mAccountKey;
-        if (mMailboxId == -1) {
-            mMailboxId = message.mMailboxKey;
-        }
-
-        if (mOrderManager != null) {
-            mOrderManager.moveTo(message.mId);
-        }
-
-        mSubjectView.setText(message.mSubject);
-        mFromView.setText(Address.toFriendly(Address.unpack(message.mFrom)));
-        Date date = new Date(message.mTimeStamp);
-        mTimeView.setText(mTimeFormat.format(date));
-        mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
-        mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
-        String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
-        mCcView.setText(friendlyCc);
-        mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
-        mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
-        mFavoriteIcon.setImageDrawable(message.mFlagFavorite ? mFavoriteIconOn : mFavoriteIconOff);
-        // Show the message invite section if we're an incoming meeting invitation only
-        mInviteSection.setVisibility((message.mFlags & Message.FLAG_INCOMING_MEETING_INVITE) != 0 ?
-                View.VISIBLE : View.GONE);
-
-        // Handle partially-loaded email, as follows:
-        // 1. Check value of message.mFlagLoaded
-        // 2. If != LOADED, ask controller to load it
-        // 3. Controller callback (after loaded) should trigger LoadBodyTask & LoadAttachmentsTask
-        // 4. Else start the loader tasks right away (message already loaded)
-        if (okToFetch && message.mFlagLoaded != Message.FLAG_LOADED_COMPLETE) {
-            mControllerCallback.getWrappee().setWaitForLoadMessageId(message.mId);
-            mController.loadMessageForView(message.mId);
-        } else {
-            mControllerCallback.getWrappee().setWaitForLoadMessageId(-1);
-            // Ask for body
-            mLoadBodyTask = new LoadBodyTask(message.mId);
-            mLoadBodyTask.execute();
-        }
-    }
-
-    /**
-     * Reload the body from the provider cursor.  This must only be called from the UI thread.
-     *
-     * @param bodyText text part
-     * @param bodyHtml html part
-     *
-     * TODO deal with html vs text and many other issues
-     */
-    private void reloadUiFromBody(String bodyText, String bodyHtml) {
-        String text = null;
-        mHtmlTextRaw = null;
-        boolean hasImages = false;
-
-        if (bodyHtml == null) {
-            text = bodyText;
-            /*
-             * Convert the plain text to HTML
-             */
-            StringBuffer sb = new StringBuffer("<html><body>");
-            if (text != null) {
-                // Escape any inadvertent HTML in the text message
-                text = EmailHtmlUtil.escapeCharacterToDisplay(text);
-                // Find any embedded URL's and linkify
-                Matcher m = Patterns.WEB_URL.matcher(text);
-                while (m.find()) {
-                    int start = m.start();
-                    /*
-                     * WEB_URL_PATTERN may match domain part of email address. To detect
-                     * this false match, the character just before the matched string
-                     * should not be '@'.
-                     */
-                    if (start == 0 || text.charAt(start - 1) != '@') {
-                        String url = m.group();
-                        Matcher proto = WEB_URL_PROTOCOL.matcher(url);
-                        String link;
-                        if (proto.find()) {
-                            // This is work around to force URL protocol part be lower case,
-                            // because WebView could follow only lower case protocol link.
-                            link = proto.group().toLowerCase() + url.substring(proto.end());
-                        } else {
-                            // Patterns.WEB_URL matches URL without protocol part,
-                            // so added default protocol to link.
-                            link = "http://" + url;
-                        }
-                        String href = String.format("<a href=\"%s\">%s</a>", link, url);
-                        m.appendReplacement(sb, href);
-                    }
-                    else {
-                        m.appendReplacement(sb, "$0");
-                    }
-                }
-                m.appendTail(sb);
-            }
-            sb.append("</body></html>");
-            text = sb.toString();
-        } else {
-            text = bodyHtml;
-            mHtmlTextRaw = bodyHtml;
-            hasImages = IMG_TAG_START_REGEX.matcher(text).find();
-        }
-
-        mShowPicturesSection.setVisibility(hasImages ? View.VISIBLE : View.GONE);
-        if (mMessageContentView != null) {
-            mMessageContentView.loadDataWithBaseURL("email://", text, "text/html", "utf-8", null);
-        }
-
-        // Ask for attachments after body
-        mLoadAttachmentsTask = new LoadAttachmentsTask();
-        mLoadAttachmentsTask.execute(mMessage.mId);
-    }
-
-    /**
-     * Controller results listener.  We wrap it with {@link ControllerResultUiThreadWrapper},
-     * so all methods are called on the UI thread.
-     */
-    private class ControllerResults extends Controller.Result {
-        private long mWaitForLoadMessageId;
-
-        public void setWaitForLoadMessageId(long messageId) {
-            mWaitForLoadMessageId = messageId;
-        }
-
-        @Override
-        public void loadMessageForViewCallback(MessagingException result, long messageId,
-                int progress) {
-            if (messageId != mWaitForLoadMessageId) {
-                // We are not waiting for this message to load, so exit quickly
-                return;
-            }
-            if (result == null) {
-                switch (progress) {
-                    case 0:
-                        setProgressBarIndeterminateVisibility(true);
-                        loadBodyContent("file:///android_asset/loading.html");
-                        break;
-                    case 100:
-                        mWaitForLoadMessageId = -1;
-                        setProgressBarIndeterminateVisibility(false);
-                        // reload UI and reload everything else too
-                        // pass false to LoadMessageTask to prevent looping here
-                        cancelAllTasks();
-                        mLoadMessageTask = new LoadMessageTask(mFileEmailUri, mMessageId, false);
-                        mLoadMessageTask.execute();
-                        break;
-                    default:
-                        // do nothing - we don't have a progress bar at this time
-                        break;
-                }
-            } else {
-                mWaitForLoadMessageId = -1;
-                setProgressBarIndeterminateVisibility(false);
-                Utility.showToast(MessageView.this, R.string.status_network_error);
-                loadBodyContent("file:///android_asset/empty.html");
-            }
-        }
-
-        private void loadBodyContent(String uri) {
-            if (mMessageContentView != null) {
-                mMessageContentView.loadUrl(uri);
-            }
-        }
-
-        @Override
-        public void loadAttachmentCallback(MessagingException result, long messageId,
-                long attachmentId, int progress) {
-            if (messageId == MessageView.this.mMessageId) {
-                if (result == null) {
-                    switch (progress) {
-                        case 0:
-                            enableAttachments(false);
-                            showFetchingAttachmentProgress(true);
-                            Utility.showToast(MessageView.this,
-                                    R.string.message_view_fetching_attachment_toast);
-                            break;
-                        case 100:
-                            enableAttachments(true);
-                            showFetchingAttachmentProgress(false);
-                            updateAttachmentThumbnail(attachmentId);
-                            doFinishLoadAttachment(attachmentId);
-                            break;
-                        default:
-                            // do nothing - we don't have a progress bar at this time
-                            break;
-                    }
-                } else {
-                    enableAttachments(true);
-                    showFetchingAttachmentProgress(false);
-                    Utility.showToast(MessageView.this, R.string.status_network_error);
-                }
-            }
-        }
-
-        private void enableAttachments(boolean enable) {
-            for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) {
-                AttachmentInfo attachment = (AttachmentInfo) mAttachments.getChildAt(i).getTag();
-                attachment.viewButton.setEnabled(enable);
-                attachment.downloadButton.setEnabled(enable);
-            }
-        }
-
-        private void showFetchingAttachmentProgress(boolean show) {
-            if (show) {
-                mProgressDialog.setMessage(
-                        getString(R.string.message_view_fetching_attachment_progress,
-                                mLoadAttachmentName));
-                mProgressDialog.show();
-            } else {
-                mProgressDialog.dismiss();
-            }
-            setProgressBarIndeterminateVisibility(show);
-        }
-
-        @Override
-        public void updateMailboxCallback(MessagingException result, long accountId,
-                long mailboxId, int progress, int numNewMessages) {
-            if (result != null || progress == 100) {
-                Email.updateMailboxRefreshTime(mailboxId);
-            }
-        }
-    }
-
-    /**
-     * Back in the UI thread, handle the final steps of downloading an attachment (view or save).
-     *
-     * @param attachmentId the attachment that was just downloaded
-     */
-    private void doFinishLoadAttachment(long attachmentId) {
-        // If the result does't line up, just skip it - we handle one at a time.
-        if (attachmentId != mLoadAttachmentId) {
-            return;
-        }
-        Attachment attachment =
-            Attachment.restoreAttachmentWithId(MessageView.this, attachmentId);
-        Uri attachmentUri = AttachmentProvider.getAttachmentUri(mAccountId, attachment.mId);
-        Uri contentUri =
-            AttachmentProvider.resolveAttachmentIdToContentUri(getContentResolver(), attachmentUri);
-
-        if (mLoadAttachmentSave) {
-            try {
-                File file = Utility.createUniqueFile(Environment.getExternalStorageDirectory(),
-                        attachment.mFileName);
-                InputStream in = getContentResolver().openInputStream(contentUri);
-                OutputStream out = new FileOutputStream(file);
-                IOUtils.copy(in, out);
-                out.flush();
-                out.close();
-                in.close();
-
-                Utility.showToast(this, String.format(
-                        getString(R.string.message_view_status_attachment_saved), file.getName()));
-
-                new MediaScannerNotifier(this, file);
-            } catch (IOException ioe) {
-                Utility.showToast(this,
-                        getString(R.string.message_view_status_attachment_not_saved));
-            }
-        } else {
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(contentUri);
-                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
-                                | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-                startActivity(intent);
-            } catch (ActivityNotFoundException e) {
-                Utility.showToast(this, R.string.message_view_display_attachment_toast);
-                // TODO: Add a proper warning message (and lots of upstream cleanup to prevent
-                // it from happening) in the next release.
-            }
-        }
-    }
-
-    /**
-     * This notifier is created after an attachment completes downloaded.  It attaches to the
-     * media scanner and waits to handle the completion of the scan.  At that point it tries
-     * to start an ACTION_VIEW activity for the attachment.
-    */
-    private static class MediaScannerNotifier implements MediaScannerConnectionClient {
-        private Activity mActivity;
-        private MediaScannerConnection mConnection;
-        private File mFile;
-
-        public MediaScannerNotifier(Activity activity, File file) {
-            mActivity = activity;
-            mFile = file;
-            mConnection = new MediaScannerConnection(mActivity.getApplicationContext(), this);
-            mConnection.connect();
-        }
-
-        public void onMediaScannerConnected() {
-            mConnection.scanFile(mFile.getAbsolutePath(), null);
-        }
-
-        public void onScanCompleted(String path, Uri uri) {
-            try {
-                if (uri != null) {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setData(uri);
-                    mActivity.startActivity(intent);
-                }
-            } catch (ActivityNotFoundException e) {
-                Utility.showToast(mActivity, R.string.message_view_display_attachment_toast);
-                // TODO: Add a proper warning message (and lots of upstream cleanup to prevent
-                // it from happening) in the next release.
-            } finally {
-                mConnection.disconnect();
-                mActivity = null;
-            }
-        }
+        mMoveToNewer.setEnabled((mOrderManager != null) && mOrderManager.canMoveToNewer());
+        mMoveToOlder.setEnabled((mOrderManager != null) && mOrderManager.canMoveToOlder());
     }
 
+    /** Implements {@link MessageOrderManager.Callback#onMessageNotFound()}. */
+    // TODO Name too generic.  Rename this.
     @Override
     public void onMessageNotFound() {
         finish();
     }
 
+    /** Implements {@link MessageOrderManager.Callback#onMessagesChanged()}. */
+    // TODO Name too generic.  Rename this.
     @Override
     public void onMessagesChanged() {
         updateNavigationArrows();
     }
+
+    @Override
+    public void onLoadMessageStarted() {
+        setProgressBarIndeterminateVisibility(true);
+    }
+
+    @Override
+    public void onLoadMessageFinished() {
+        setProgressBarIndeterminateVisibility(false);
+    }
+
+    @Override
+    public void onLoadMessageError() {
+        onLoadMessageFinished();
+    }
+
+    @Override
+    public void onFetchAttachmentStarted(String attachmentName) {
+        mFetchAttachmentProgressDialog.setMessage(
+                getString(R.string.message_view_fetching_attachment_progress,
+                        attachmentName));
+        mFetchAttachmentProgressDialog.show();
+        setProgressBarIndeterminateVisibility(true);
+    }
+
+    @Override
+    public void onFetchAttachmentFinished() {
+        mFetchAttachmentProgressDialog.dismiss();
+        setProgressBarIndeterminateVisibility(false);
+    }
+
+    @Override
+    public void onFetchAttachmentError() {
+        onFetchAttachmentFinished();
+    }
+
+    @Override
+    public void onMessageNotExists() { // Probably meessage deleted.
+        finish();
+    }
+
+    @Override
+    public void onRespondedToInvite(int response) {
+        if (!moveToOlder()) {
+            finish(); // if this is the last message, move up to message-list.
+        }
+    }
+
+    @Override
+    public void onCalendarLinkClicked(long epochEventStartTime) {
+        Uri uri = Uri.parse("content://com.android.calendar/time/" + epochEventStartTime);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(uri);
+        intent.putExtra("VIEW", "DAY");
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+        startActivity(intent);
+    }
 }
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
new file mode 100644
index 000000000..16bd0b035
--- /dev/null
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -0,0 +1,1166 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email.activity;
+
+import com.android.email.Controller;
+import com.android.email.ControllerResultUiThreadWrapper;
+import com.android.email.Email;
+import com.android.email.R;
+import com.android.email.Utility;
+import com.android.email.mail.Address;
+import com.android.email.mail.MeetingInfo;
+import com.android.email.mail.MessagingException;
+import com.android.email.mail.PackedString;
+import com.android.email.mail.internet.EmailHtmlUtil;
+import com.android.email.mail.internet.MimeUtility;
+import com.android.email.provider.AttachmentProvider;
+import com.android.email.provider.EmailContent.Attachment;
+import com.android.email.provider.EmailContent.Body;
+import com.android.email.provider.EmailContent.Message;
+import com.android.email.service.EmailServiceConstants;
+
+import org.apache.commons.io.IOUtils;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.ContactsContract.QuickContact;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Patterns;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+// TODO Restore "Show pictures" state and scroll position on rotation.
+
+public class MessageViewFragment extends Fragment implements View.OnClickListener {
+    private Context mContext;
+
+    // Regex that matches start of img tag. '<(?i)img\s+'.
+    private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");
+    // Regex that matches Web URL protocol part as case insensitive.
+    private static final Pattern WEB_URL_PROTOCOL = Pattern.compile("(?i)http|https://");
+
+    private static int PREVIEW_ICON_WIDTH = 62;
+    private static int PREVIEW_ICON_HEIGHT = 62;
+
+    private TextView mSubjectView;
+    private TextView mFromView;
+    private TextView mDateView;
+    private TextView mTimeView;
+    private TextView mToView;
+    private TextView mCcView;
+    private View mCcContainerView;
+    private WebView mMessageContentView;
+    private LinearLayout mAttachments;
+    private ImageView mAttachmentIcon;
+    private ImageView mFavoriteIcon;
+    private View mShowPicturesSection;
+    private View mInviteSection;
+    private ImageView mSenderPresenceView;
+    private View mScrollView;
+
+    // calendar meeting invite answers
+    private TextView mMeetingYes;
+    private TextView mMeetingMaybe;
+    private TextView mMeetingNo;
+    private int mPreviousMeetingResponse = -1;
+
+    /**
+     * If set, URI to the email (i.e. *.eml files, and possibly *.msg files) file that's being
+     * viewed.
+     *
+     * Use {@link #isViewingEmailFile()} to see if the activity is created for opening an EML file.
+     *
+     * TODO: We probably should split it into two different MessageViews, one for regular messages
+     * and the other for for EML files (these two will share the same base MessageView class) to
+     * eliminate the bunch of 'if {@link #isViewingEmailFile()}'s.
+     * Do this after making it into a fragment.
+     */
+    private Uri mFileEmailUri;
+    private long mAccountId = -1;
+    private long mMessageId = -1;
+    private Message mMessage;
+
+    private LoadMessageTask mLoadMessageTask;
+    private LoadBodyTask mLoadBodyTask;
+    private LoadAttachmentsTask mLoadAttachmentsTask;
+    private PresenceUpdater mPresenceUpdater;
+
+    private long mLoadAttachmentId;         // the attachment being saved/viewed
+    private boolean mLoadAttachmentSave;    // if true, saving - if false, viewing
+    private String mLoadAttachmentName;     // the display name
+
+    private java.text.DateFormat mDateFormat;
+    private java.text.DateFormat mTimeFormat;
+
+    private Drawable mFavoriteIconOn;
+    private Drawable mFavoriteIconOff;
+
+    private Controller mController;
+    private ControllerResultUiThreadWrapper<ControllerResults> mControllerCallback;
+
+    // contains the HTML body. Is used by LoadAttachmentTask to display inline images.
+    // is null most of the time, is used transiently to pass info to LoadAttachementTask
+    private String mHtmlTextRaw;
+
+    // contains the HTML content as set in WebView.
+    private String mHtmlTextWebView;
+
+    /**
+     * Encapsulates known information about a single attachment.
+     */
+    private static class AttachmentInfo {
+        public String name;
+        public String contentType;
+        public long size;
+        public long attachmentId;
+        public Button viewButton;
+        public Button downloadButton;
+        public ImageView iconView;
+    }
+
+    public interface Callback {
+        /**
+         * Called when a link in a message is clicked.
+         *
+         * @param url link url that's clicked.
+         * @return true if handled, false otherwise.
+         */
+        public boolean onUrlInMessageClicked(String url);
+
+        /** Called when the message specified doesn't exist. */
+        public void onMessageNotExists();
+
+        /** Called when the "view in calendar" link is clicked. */
+        public void onCalendarLinkClicked(long epochEventStartTime);
+
+        /** Called when it starts loading a message. */
+        public void onLoadMessageStarted();
+
+        /** Called when it successfully finishes loading a message. */
+        public void onLoadMessageFinished();
+
+        /** Called when an error occurred during loading a message. */
+        public void onLoadMessageError();
+
+        /** Called when the current message is set unread. */
+        public void onMessageSetUnread();
+
+        /**
+         * Called when a calender response button is clicked.
+         *
+         * @param response one of {@link EmailServiceConstants#MEETING_REQUEST_ACCEPTED},
+         * {@link EmailServiceConstants#MEETING_REQUEST_DECLINED}, or
+         * {@link EmailServiceConstants#MEETING_REQUEST_TENTATIVE}.
+         */
+        public void onRespondedToInvite(int response);
+
+        /** Called when it starts loading an attachment. */
+        public void onFetchAttachmentStarted(String attachmentName);
+
+        /** Called when it successfully finishes loading an attachment. */
+        public void onFetchAttachmentFinished();
+
+        /** Called when an error occurred during loading an attachment. */
+        public void onFetchAttachmentError();
+    }
+
+    private static final class EmptyCallback implements Callback {
+        public static final Callback INSTANCE = new EmptyCallback();
+
+        @Override
+        public void onCalendarLinkClicked(long epochEventStartTime) {
+        }
+
+        @Override
+        public void onFetchAttachmentError() {
+        }
+
+        @Override
+        public void onFetchAttachmentFinished() {
+        }
+
+        @Override
+        public void onFetchAttachmentStarted(String attachmentName) {
+        }
+
+        @Override
+        public void onLoadMessageError() {
+        }
+
+        @Override
+        public void onLoadMessageFinished() {
+        }
+
+        @Override
+        public void onLoadMessageStarted() {
+        }
+
+        @Override
+        public void onMessageNotExists() {
+        }
+
+        @Override
+        public void onMessageSetUnread() {
+        }
+
+        @Override
+        public void onRespondedToInvite(int response) {
+        }
+
+        @Override
+        public boolean onUrlInMessageClicked(String url) {
+            return false;
+        }
+    }
+
+    private Callback mCallback = EmptyCallback.INSTANCE;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mContext = getActivity().getApplicationContext();
+
+        mControllerCallback = new ControllerResultUiThreadWrapper<ControllerResults>(
+                new Handler(), new ControllerResults());
+
+        mPresenceUpdater = new PresenceUpdater(mContext);
+        mDateFormat = android.text.format.DateFormat.getDateFormat(mContext); // short format
+        mTimeFormat = android.text.format.DateFormat.getTimeFormat(mContext); // 12/24 date format
+
+        final Resources res = mContext.getResources();
+        mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_big_buttonless_on);
+        mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_big_buttonless_off);
+
+        mController = Controller.getInstance(mContext);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.message_view_header, container, false);
+
+        mSubjectView = (TextView) view.findViewById(R.id.subject);
+        mFromView = (TextView) view.findViewById(R.id.from);
+        mToView = (TextView) view.findViewById(R.id.to);
+        mCcView = (TextView) view.findViewById(R.id.cc);
+        mCcContainerView = view.findViewById(R.id.cc_container);
+        mDateView = (TextView) view.findViewById(R.id.date);
+        mTimeView = (TextView) view.findViewById(R.id.time);
+        mMessageContentView = (WebView) view.findViewById(R.id.message_content);
+        mAttachments = (LinearLayout) view.findViewById(R.id.attachments);
+        mAttachmentIcon = (ImageView) view.findViewById(R.id.attachment);
+        mFavoriteIcon = (ImageView) view.findViewById(R.id.favorite);
+        mShowPicturesSection = view.findViewById(R.id.show_pictures_section);
+        mInviteSection = view.findViewById(R.id.invite_section);
+        mSenderPresenceView = (ImageView) view.findViewById(R.id.presence);
+        mScrollView = view.findViewById(R.id.scrollview);
+
+        mFromView.setOnClickListener(this);
+        mSenderPresenceView.setOnClickListener(this);
+        mFavoriteIcon.setOnClickListener(this);
+        view.findViewById(R.id.show_pictures).setOnClickListener(this);
+
+        mMeetingYes = (TextView) view.findViewById(R.id.accept);
+        mMeetingMaybe = (TextView) view.findViewById(R.id.maybe);
+        mMeetingNo = (TextView) view.findViewById(R.id.decline);
+
+        mMeetingYes.setOnClickListener(this);
+        mMeetingMaybe.setOnClickListener(this);
+        mMeetingNo.setOnClickListener(this);
+        view.findViewById(R.id.invite_link).setOnClickListener(this);
+
+        mMessageContentView.setVerticalScrollBarEnabled(false);
+        mMessageContentView.getSettings().setBlockNetworkLoads(true);
+        mMessageContentView.getSettings().setSupportZoom(false);
+        mMessageContentView.setWebViewClient(new CustomWebViewClient());
+        return view;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mController.addResultCallback(mControllerCallback);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy() {
+        mController.removeResultCallback(mControllerCallback);
+        cancelAllTasks();
+        mMessageContentView.destroy();
+        mMessageContentView = null;
+
+        // If we're leaving a non-attachment message, delete any/all attachment messages
+
+        // TODO It's probably wronn.  We can show an EML in other app's stack, in which case
+        // we can task-switch between the main app and the activity showing an EML.
+        // We probably have to keep track of the number of EMLs currently open in a static field.
+        if (!isViewingEmailFile()) {
+            mController.deleteAttachmentMessages();
+        }
+        super.onDestroy();
+    }
+
+    public void setCallback(Callback callback) {
+        mCallback = (callback == null) ? EmptyCallback.INSTANCE : callback;
+    }
+
+    private void cancelAllTasks() {
+        Utility.cancelTaskInterrupt(mLoadMessageTask);
+        mLoadMessageTask = null;
+        Utility.cancelTaskInterrupt(mLoadBodyTask);
+        mLoadBodyTask = null;
+        Utility.cancelTaskInterrupt(mLoadAttachmentsTask);
+        mLoadAttachmentsTask = null;
+        mPresenceUpdater.cancelAll();
+    }
+
+    /**
+     * @return true if viewing an email file.  (i.e. *.eml files)
+     */
+    private boolean isViewingEmailFile() {
+        return mFileEmailUri != null;
+    }
+
+    /**
+     * Returns the account id of the current message, or -1 if unknown.
+     * Probably doesn't make sense if {@link #isViewingEmailFile()}.
+     */
+    public long getAccountId() {
+        return mAccountId;
+    }
+
+    /** Called by activities to set an id of a message to open. */
+    public void openMessage(long messageId) {
+        mFileEmailUri = null;
+        mMessageId = messageId;
+        mAccountId = -1;
+        openMessageInternal();
+    }
+
+    /** Called by activities to a URI to an EML file to open. */
+    public void openMessage(Uri fileEmailUri) {
+        mFileEmailUri = fileEmailUri;
+        mMessageId = -1;
+        mAccountId = -1;
+        openMessageInternal();
+    }
+
+    private void openMessageInternal() {
+        cancelAllTasks();
+        if (mMessageContentView != null) {
+            mMessageContentView.getSettings().setBlockNetworkLoads(true);
+            mMessageContentView.scrollTo(0, 0);
+            mMessageContentView.loadUrl("file:///android_asset/empty.html");
+        }
+        mScrollView.scrollTo(0, 0);
+        mAttachments.removeAllViews();
+        mAttachments.setVisibility(View.GONE);
+        mAttachmentIcon.setVisibility(View.GONE);
+        mLoadMessageTask = new LoadMessageTask(mFileEmailUri, mMessageId, true);
+        mLoadMessageTask.execute();
+    }
+
+    /**
+     * Handle clicks on sender, which shows {@link QuickContact} or prompts to add
+     * the sender as a contact.
+     *
+     * TODO Move DB lookup to a worker thread.
+     */
+    private void onClickSender() {
+        // Bail early if message or sender not present
+        if (mMessage == null) return;
+
+        final Address senderEmail = Address.unpackFirst(mMessage.mFrom);
+        if (senderEmail == null) return;
+
+        // First perform lookup query to find existing contact
+        final ContentResolver resolver = mContext.getContentResolver();
+        final String address = senderEmail.getAddress();
+        final Uri dataUri = Uri.withAppendedPath(CommonDataKinds.Email.CONTENT_FILTER_URI,
+                Uri.encode(address));
+        final Uri lookupUri = ContactsContract.Data.getContactLookupUri(resolver, dataUri);
+
+        if (lookupUri != null) {
+            // Found matching contact, trigger QuickContact
+            QuickContact.showQuickContact(mContext, mSenderPresenceView, lookupUri,
+                    QuickContact.MODE_LARGE, null);
+        } else {
+            // No matching contact, ask user to create one
+            final Uri mailUri = Uri.fromParts("mailto", address, null);
+            final Intent intent = new Intent(ContactsContract.Intents.SHOW_OR_CREATE_CONTACT,
+                    mailUri);
+
+            // Pass along full E-mail string for possible create dialog
+            intent.putExtra(ContactsContract.Intents.EXTRA_CREATE_DESCRIPTION,
+                    senderEmail.toString());
+
+            // Only provide personal name hint if we have one
+            final String senderPersonal = senderEmail.getPersonal();
+            if (!TextUtils.isEmpty(senderPersonal)) {
+                intent.putExtra(ContactsContract.Intents.Insert.NAME, senderPersonal);
+            }
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+
+            startActivity(intent);
+        }
+    }
+
+    /**
+     * Toggle favorite status and write back to provider
+     */
+    private void onClickFavorite() {
+        if (isViewingEmailFile()) {
+            return;
+        }
+        if (mMessage != null) {
+            // Update UI
+            boolean newFavorite = ! mMessage.mFlagFavorite;
+            mFavoriteIcon.setImageDrawable(newFavorite ? mFavoriteIconOn : mFavoriteIconOff);
+
+            // Update provider
+            mMessage.mFlagFavorite = newFavorite;
+            mController.setMessageFavorite(mMessageId, newFavorite);
+        }
+    }
+
+    /**
+     * Set message read/unread.
+     */
+    public void onMarkMessageAsRead(boolean isRead) {
+        if (isViewingEmailFile()) {
+            return;
+        }
+        if (mMessage != null && mMessage.mFlagRead != isRead) {
+            mMessage.mFlagRead = isRead;
+            mController.setMessageRead(mMessageId, isRead);
+            if (!isRead) { // Became unread.  We need to close the message.
+                mCallback.onMessageSetUnread();
+            }
+        }
+    }
+
+    /**
+     * Send a service message indicating that a meeting invite button has been clicked.
+     */
+    private void onRespondToInvite(int response, int toastResId) {
+        if (isViewingEmailFile()) {
+            return;
+        }
+        // do not send twice in a row the same response
+        if (mPreviousMeetingResponse != response) {
+            mController.sendMeetingResponse(mMessageId, response);
+            mPreviousMeetingResponse = response;
+        }
+        Utility.showToast(getActivity(), toastResId);
+        mCallback.onRespondedToInvite(response);
+    }
+
+    private void onDownloadAttachment(AttachmentInfo attachment) {
+        if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+            /*
+             * Abort early if there's no place to save the attachment. We don't want to spend
+             * the time downloading it and then abort.
+             */
+            Utility.showToast(getActivity(), R.string.message_view_status_attachment_not_saved);
+            return;
+        }
+        startLoadAttachment(attachment, true);
+    }
+
+    private void onViewAttachment(AttachmentInfo attachment) {
+        startLoadAttachment(attachment, false);
+    }
+
+    private void startLoadAttachment(AttachmentInfo attachment, boolean save) {
+        mLoadAttachmentId = attachment.attachmentId;
+        mLoadAttachmentSave = save;
+        mLoadAttachmentName = attachment.name;
+
+        mController.loadAttachment(attachment.attachmentId, mMessageId, mMessage.mMailboxKey,
+                mAccountId);
+    }
+
+    /**
+     * Called by ControllerResults. Handle the final steps of downloading an attachment
+     * (view or save).
+     *
+     * @param attachmentId the attachment that was just downloaded
+     */
+    private void doFinishLoadAttachment(long attachmentId) {
+        // If the result does't line up, just skip it - we handle one at a time.
+        if (attachmentId != mLoadAttachmentId) {
+            return;
+        }
+        Attachment attachment = Attachment.restoreAttachmentWithId(mContext, attachmentId);
+        Uri attachmentUri = AttachmentProvider.getAttachmentUri(mAccountId, attachment.mId);
+        Uri contentUri = AttachmentProvider.resolveAttachmentIdToContentUri(
+                mContext.getContentResolver(), attachmentUri);
+
+        if (mLoadAttachmentSave) {
+            try {
+                File file = Utility.createUniqueFile(Environment.getExternalStorageDirectory(),
+                        attachment.mFileName);
+                InputStream in = mContext.getContentResolver().openInputStream(contentUri);
+                OutputStream out = new FileOutputStream(file);
+                IOUtils.copy(in, out);
+                out.flush();
+                out.close();
+                in.close();
+
+                Utility.showToast(getActivity(), String.format(
+                        mContext.getString(R.string.message_view_status_attachment_saved),
+                        file.getName()));
+
+                MediaOpener.scanAndOpen(getActivity(), file);
+            } catch (IOException ioe) {
+                Utility.showToast(getActivity(), R.string.message_view_status_attachment_not_saved);
+            }
+        } else {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(contentUri);
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                                | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+                startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Utility.showToast(getActivity(), R.string.message_view_display_attachment_toast);
+                // TODO: Add a proper warning message (and lots of upstream cleanup to prevent
+                // it from happening) in the next release.
+            }
+        }
+    }
+
+    private void onShowPicturesInHtml() {
+        if (mMessage != null) {
+            if (mMessageContentView != null) {
+                mMessageContentView.getSettings().setBlockNetworkLoads(false);
+                if (mHtmlTextWebView != null) {
+                    mMessageContentView.loadDataWithBaseURL("email://", mHtmlTextWebView,
+                                                            "text/html", "utf-8", null);
+                }
+            }
+            mShowPicturesSection.setVisibility(View.GONE);
+        }
+    }
+
+    private void onInviteLinkClicked() {
+        if (isViewingEmailFile()) {
+            return;
+        }
+        String startTime = new PackedString(mMessage.mMeetingInfo).get(MeetingInfo.MEETING_DTSTART);
+        if (startTime != null) {
+            long epochTimeMillis = Utility.parseEmailDateTimeToMillis(startTime);
+            mCallback.onCalendarLinkClicked(epochTimeMillis);
+        } else {
+            Email.log("meetingInfo without DTSTART " + mMessage.mMeetingInfo);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.from:
+            case R.id.presence:
+                onClickSender();
+                break;
+            case R.id.favorite:
+                onClickFavorite();
+                break;
+            case R.id.download:
+                onDownloadAttachment((AttachmentInfo) view.getTag());
+                break;
+            case R.id.view:
+                onViewAttachment((AttachmentInfo) view.getTag());
+                break;
+            case R.id.show_pictures:
+                onShowPicturesInHtml();
+                break;
+            case R.id.accept:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_ACCEPTED,
+                         R.string.message_view_invite_toast_yes);
+                break;
+            case R.id.maybe:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_TENTATIVE,
+                         R.string.message_view_invite_toast_maybe);
+                break;
+            case R.id.decline:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_DECLINED,
+                         R.string.message_view_invite_toast_no);
+                break;
+            case R.id.invite_link:
+                onInviteLinkClicked();
+                break;
+        }
+    }
+
+    /**
+     * Start checking presence of the sender of the message.
+     *
+     * Note:  This is just a polling operation.  A more advanced solution would be to keep the
+     * cursor open and respond to presence status updates (in the form of content change
+     * notifications).  However, because presence changes fairly slowly compared to the duration
+     * of viewing a single message, a simple poll at message load (and onResume) should be
+     * sufficient.
+     */
+    private void startPresenceCheck() {
+        // Set "unknown" presence icon.
+        mSenderPresenceView.setImageResource(PresenceUpdater.getPresenceIconResourceId(null));
+        if (mMessage != null) {
+            Address sender = Address.unpackFirst(mMessage.mFrom);
+            if (sender != null) {
+                String email = sender.getAddress();
+                if (email != null) {
+                    mPresenceUpdater.checkPresence(email, new PresenceUpdater.Callback() {
+                        @Override
+                        public void onPresenceResult(String emailAddress, Integer presenceStatus) {
+                            mSenderPresenceView.setImageResource(
+                                    PresenceUpdater.getPresenceIconResourceId(presenceStatus));
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    /**
+     * Async task for loading a single message outside of the UI thread
+     */
+    private class LoadMessageTask extends AsyncTask<Void, Void, Message> {
+
+        private final long mId;
+        private final boolean mOkToFetch;
+        private final Uri mFileEmailUri;
+
+        /**
+         * Special constructor to cache some local info
+         */
+        public LoadMessageTask(Uri fileEmailUri, long messageId, boolean okToFetch) {
+            mFileEmailUri = fileEmailUri;
+            mId = messageId;
+            mOkToFetch = okToFetch;
+        }
+
+        /**
+         * There will either be a Uri in the Intent (i.e. whose content is the Message to be
+         * loaded), or mId will be holding the id of the Message as stored in the provider.
+         * If we're loading via Uri, the Controller does the actual message parsing and storage,
+         * and we setup the message id and mailbox id based on the result; forward and reply are
+         * disabled for messages loaded via Uri
+         */
+        @Override
+        protected Message doInBackground(Void... params) {
+            // If we have a URI, then we were opened via an intent filter (e.g. an attachment that
+            // has a mime type that we can handle (e.g. message/rfc822).
+            if (mFileEmailUri != null) {
+                final Activity activity = getActivity();
+                // Put up a toast; this can take a little while...
+                Utility.showToast(activity, R.string.message_view_parse_message_toast);
+                Message msg = mController.loadMessageFromUri(mFileEmailUri);
+                if (msg == null) {
+                    // Indicate that the attachment couldn't be loaded
+                    Utility.showToast(activity, R.string.message_view_display_attachment_toast);
+                    return null;
+                }
+                return msg;
+            }
+            return Message.restoreMessageWithId(mContext, mId);
+        }
+
+        @Override
+        protected void onPostExecute(Message message) {
+            /* doInBackground() may return null result (due to restoreMessageWithId())
+             * and in that situation we want to Activity.finish().
+             *
+             * OTOH we don't want to Activity.finish() for isCancelled() because this
+             * would introduce a surprise side-effect to task cancellation: every task
+             * cancelation would also result in finish().
+             *
+             * Right now LoadMesageTask is cancelled not only from onDestroy(),
+             * and it would be a bug to also finish() the activity in that situation.
+             */
+            if (isCancelled()) {
+                return;
+            }
+            if (message == null) {
+                mCallback.onMessageNotExists();
+                return;
+            }
+            mMessageId = message.mId;
+
+            reloadUiFromMessage(message, mOkToFetch);
+            startPresenceCheck();
+        }
+    }
+
+    /**
+     * Async task for loading a single message body outside of the UI thread
+     */
+    private class LoadBodyTask extends AsyncTask<Void, Void, String[]> {
+
+        private long mId;
+        private boolean mErrorLoadingMessageBody;
+
+        /**
+         * Special constructor to cache some local info
+         */
+        public LoadBodyTask(long messageId) {
+            mId = messageId;
+        }
+
+        @Override
+        protected String[] doInBackground(Void... params) {
+            try {
+                String text = null;
+                String html = Body.restoreBodyHtmlWithMessageId(mContext, mId);
+                if (html == null) {
+                    text = Body.restoreBodyTextWithMessageId(mContext, mId);
+                }
+                return new String[] { text, html };
+            } catch (RuntimeException re) {
+                // This catches SQLiteException as well as other RTE's we've seen from the
+                // database calls, such as IllegalStateException
+                Log.d(Email.LOG_TAG, "Exception while loading message body: " + re.toString());
+                mErrorLoadingMessageBody = true;
+                return new String[] { null, null };
+            }
+        }
+
+        @Override
+        protected void onPostExecute(String[] results) {
+            if (results == null) {
+                if (mErrorLoadingMessageBody) {
+                    Utility.showToast(getActivity(), R.string.error_loading_message_body);
+                }
+                return;
+            }
+            reloadUiFromBody(results[0], results[1]);    // text, html
+            onMarkMessageAsRead(true);
+        }
+    }
+
+    /**
+     * Async task for loading attachments
+     *
+     * Note:  This really should only be called when the message load is complete - or, we should
+     * leave open a listener so the attachments can fill in as they are discovered.  In either case,
+     * this implementation is incomplete, as it will fail to refresh properly if the message is
+     * partially loaded at this time.
+     */
+    private class LoadAttachmentsTask extends AsyncTask<Long, Void, Attachment[]> {
+        @Override
+        protected Attachment[] doInBackground(Long... messageIds) {
+            return Attachment.restoreAttachmentsWithMessageId(mContext, messageIds[0]);
+        }
+
+        @Override
+        protected void onPostExecute(Attachment[] attachments) {
+            if (attachments == null) {
+                return;
+            }
+            boolean htmlChanged = false;
+            for (Attachment attachment : attachments) {
+                if (mHtmlTextRaw != null && attachment.mContentId != null
+                        && attachment.mContentUri != null) {
+                    // for html body, replace CID for inline images
+                    // Regexp which matches ' src="cid:contentId"'.
+                    String contentIdRe =
+                        "\\s+(?i)src=\"cid(?-i):\\Q" + attachment.mContentId + "\\E\"";
+                    String srcContentUri = " src=\"" + attachment.mContentUri + "\"";
+                    mHtmlTextRaw = mHtmlTextRaw.replaceAll(contentIdRe, srcContentUri);
+                    htmlChanged = true;
+                } else {
+                    addAttachment(attachment);
+                }
+            }
+            mHtmlTextWebView = mHtmlTextRaw;
+            mHtmlTextRaw = null;
+            if (htmlChanged && mMessageContentView != null) {
+                mMessageContentView.loadDataWithBaseURL("email://", mHtmlTextWebView,
+                                                        "text/html", "utf-8", null);
+            }
+        }
+    }
+
+    private Bitmap getPreviewIcon(AttachmentInfo attachment) {
+        try {
+            return BitmapFactory.decodeStream(
+                    mContext.getContentResolver().openInputStream(
+                            AttachmentProvider.getAttachmentThumbnailUri(
+                                    mAccountId, attachment.attachmentId,
+                                    PREVIEW_ICON_WIDTH,
+                                    PREVIEW_ICON_HEIGHT)));
+        } catch (Exception e) {
+            // We don't care what happened, we just return null for the preview icon.
+            return null;
+        }
+    }
+
+    private void updateAttachmentThumbnail(long attachmentId) {
+        for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) {
+            AttachmentInfo attachment = (AttachmentInfo) mAttachments.getChildAt(i).getTag();
+            if (attachment.attachmentId == attachmentId) {
+                Bitmap previewIcon = getPreviewIcon(attachment);
+                if (previewIcon != null) {
+                    attachment.iconView.setImageBitmap(previewIcon);
+                }
+                return;
+            }
+        }
+    }
+
+    /**
+     * Copy data from a cursor-refreshed attachment into the UI.  Called from UI thread.
+     *
+     * @param attachment A single attachment loaded from the provider
+     */
+    private void addAttachment(Attachment attachment) {
+        AttachmentInfo attachmentInfo = new AttachmentInfo();
+        attachmentInfo.size = attachment.mSize;
+        attachmentInfo.contentType =
+                AttachmentProvider.inferMimeType(attachment.mFileName, attachment.mMimeType);
+        attachmentInfo.name = attachment.mFileName;
+        attachmentInfo.attachmentId = attachment.mId;
+
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.message_view_attachment, null);
+
+        TextView attachmentName = (TextView)view.findViewById(R.id.attachment_name);
+        TextView attachmentInfoView = (TextView)view.findViewById(R.id.attachment_info);
+        ImageView attachmentIcon = (ImageView)view.findViewById(R.id.attachment_icon);
+        Button attachmentView = (Button)view.findViewById(R.id.view);
+        Button attachmentDownload = (Button)view.findViewById(R.id.download);
+
+        if ((!MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
+                Email.ACCEPTABLE_ATTACHMENT_VIEW_TYPES))
+                || (MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
+                        Email.UNACCEPTABLE_ATTACHMENT_VIEW_TYPES))) {
+            attachmentView.setVisibility(View.GONE);
+        }
+        if ((!MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
+                Email.ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))
+                || (MimeUtility.mimeTypeMatches(attachmentInfo.contentType,
+                        Email.UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES))) {
+            attachmentDownload.setVisibility(View.GONE);
+        }
+
+        if (attachmentInfo.size > Email.MAX_ATTACHMENT_DOWNLOAD_SIZE) {
+            attachmentView.setVisibility(View.GONE);
+            attachmentDownload.setVisibility(View.GONE);
+        }
+
+        attachmentInfo.viewButton = attachmentView;
+        attachmentInfo.downloadButton = attachmentDownload;
+        attachmentInfo.iconView = attachmentIcon;
+
+        view.setTag(attachmentInfo);
+        attachmentView.setOnClickListener(this);
+        attachmentView.setTag(attachmentInfo);
+        attachmentDownload.setOnClickListener(this);
+        attachmentDownload.setTag(attachmentInfo);
+
+        attachmentName.setText(attachmentInfo.name);
+        attachmentInfoView.setText(Utility.formatSize(mContext, attachmentInfo.size));
+
+        Bitmap previewIcon = getPreviewIcon(attachmentInfo);
+        if (previewIcon != null) {
+            attachmentIcon.setImageBitmap(previewIcon);
+        }
+
+        mAttachments.addView(view);
+        mAttachments.setVisibility(View.VISIBLE);
+    }
+
+    /**
+     * Reload the UI from a provider cursor.  This must only be called from the UI thread.
+     *
+     * @param message A copy of the message loaded from the database
+     * @param okToFetch If true, and message is not fully loaded, it's OK to fetch from
+     * the network.  Use false to prevent looping here.
+     *
+     * TODO: trigger presence check
+     */
+    private void reloadUiFromMessage(Message message, boolean okToFetch) {
+        mMessage = message;
+        mAccountId = message.mAccountKey;
+
+        mSubjectView.setText(message.mSubject);
+        mFromView.setText(Address.toFriendly(Address.unpack(message.mFrom)));
+        Date date = new Date(message.mTimeStamp);
+        mTimeView.setText(mTimeFormat.format(date));
+        mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
+        mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
+        String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
+        mCcView.setText(friendlyCc);
+        mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
+        mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
+        mFavoriteIcon.setImageDrawable(message.mFlagFavorite ? mFavoriteIconOn : mFavoriteIconOff);
+        // Show the message invite section if we're an incoming meeting invitation only
+        mInviteSection.setVisibility((message.mFlags & Message.FLAG_INCOMING_MEETING_INVITE) != 0 ?
+                View.VISIBLE : View.GONE);
+
+        // Handle partially-loaded email, as follows:
+        // 1. Check value of message.mFlagLoaded
+        // 2. If != LOADED, ask controller to load it
+        // 3. Controller callback (after loaded) should trigger LoadBodyTask & LoadAttachmentsTask
+        // 4. Else start the loader tasks right away (message already loaded)
+        if (okToFetch && message.mFlagLoaded != Message.FLAG_LOADED_COMPLETE) {
+            mControllerCallback.getWrappee().setWaitForLoadMessageId(message.mId);
+            mController.loadMessageForView(message.mId);
+        } else {
+            mControllerCallback.getWrappee().setWaitForLoadMessageId(-1);
+            // Ask for body
+            mLoadBodyTask = new LoadBodyTask(message.mId);
+            mLoadBodyTask.execute();
+        }
+    }
+
+    /**
+     * Reload the body from the provider cursor.  This must only be called from the UI thread.
+     *
+     * @param bodyText text part
+     * @param bodyHtml html part
+     *
+     * TODO deal with html vs text and many other issues <- WHAT DOES IT MEAN??
+     */
+    private void reloadUiFromBody(String bodyText, String bodyHtml) {
+        String text = null;
+        mHtmlTextRaw = null;
+        boolean hasImages = false;
+
+        if (bodyHtml == null) {
+            text = bodyText;
+            /*
+             * Convert the plain text to HTML
+             */
+            StringBuffer sb = new StringBuffer("<html><body>");
+            if (text != null) {
+                // Escape any inadvertent HTML in the text message
+                text = EmailHtmlUtil.escapeCharacterToDisplay(text);
+                // Find any embedded URL's and linkify
+                Matcher m = Patterns.WEB_URL.matcher(text);
+                while (m.find()) {
+                    int start = m.start();
+                    /*
+                     * WEB_URL_PATTERN may match domain part of email address. To detect
+                     * this false match, the character just before the matched string
+                     * should not be '@'.
+                     */
+                    if (start == 0 || text.charAt(start - 1) != '@') {
+                        String url = m.group();
+                        Matcher proto = WEB_URL_PROTOCOL.matcher(url);
+                        String link;
+                        if (proto.find()) {
+                            // This is work around to force URL protocol part be lower case,
+                            // because WebView could follow only lower case protocol link.
+                            link = proto.group().toLowerCase() + url.substring(proto.end());
+                        } else {
+                            // Patterns.WEB_URL matches URL without protocol part,
+                            // so added default protocol to link.
+                            link = "http://" + url;
+                        }
+                        String href = String.format("<a href=\"%s\">%s</a>", link, url);
+                        m.appendReplacement(sb, href);
+                    }
+                    else {
+                        m.appendReplacement(sb, "$0");
+                    }
+                }
+                m.appendTail(sb);
+            }
+            sb.append("</body></html>");
+            text = sb.toString();
+        } else {
+            text = bodyHtml;
+            mHtmlTextRaw = bodyHtml;
+            hasImages = IMG_TAG_START_REGEX.matcher(text).find();
+        }
+
+        // TODO this is not really accurate.
+        // - Images aren't the only network resources.  (e.g. CSS)
+        // - If images are attached to the email and small enough, we download them at once,
+        //   and won't need network access when they're shown.
+        mShowPicturesSection.setVisibility(hasImages ? View.VISIBLE : View.GONE);
+        if (mMessageContentView != null) {
+            mMessageContentView.loadDataWithBaseURL("email://", text, "text/html", "utf-8", null);
+        }
+
+        // Ask for attachments after body
+        mLoadAttachmentsTask = new LoadAttachmentsTask();
+        mLoadAttachmentsTask.execute(mMessage.mId);
+    }
+
+    /**
+     * Overrides for WebView behaviors.
+     */
+    private class CustomWebViewClient extends WebViewClient {
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            return mCallback.onUrlInMessageClicked(url);
+        }
+    }
+
+    /**
+     * Controller results listener.  We wrap it with {@link ControllerResultUiThreadWrapper},
+     * so all methods are called on the UI thread.
+     */
+    private class ControllerResults extends Controller.Result {
+        private long mWaitForLoadMessageId;
+
+        public void setWaitForLoadMessageId(long messageId) {
+            mWaitForLoadMessageId = messageId;
+        }
+
+        @Override
+        public void loadMessageForViewCallback(MessagingException result, long messageId,
+                int progress) {
+            if (messageId != mWaitForLoadMessageId) {
+                // We are not waiting for this message to load, so exit quickly
+                return;
+            }
+            if (result == null) {
+                switch (progress) {
+                    case 0:
+                        mCallback.onLoadMessageStarted();
+                        loadBodyContent("file:///android_asset/loading.html");
+                        break;
+                    case 100:
+                        mWaitForLoadMessageId = -1;
+                        mCallback.onLoadMessageFinished();
+                        // reload UI and reload everything else too
+                        // pass false to LoadMessageTask to prevent looping here
+                        cancelAllTasks();
+                        mLoadMessageTask = new LoadMessageTask(mFileEmailUri, mMessageId, false);
+                        mLoadMessageTask.execute();
+                        break;
+                    default:
+                        // do nothing - we don't have a progress bar at this time
+                        break;
+                }
+            } else {
+                mWaitForLoadMessageId = -1;
+                mCallback.onLoadMessageError();
+                Utility.showToast(getActivity(), R.string.status_network_error);
+                loadBodyContent("file:///android_asset/empty.html");
+            }
+        }
+
+        private void loadBodyContent(String uri) {
+            if (mMessageContentView != null) {
+                mMessageContentView.loadUrl(uri);
+            }
+        }
+
+        @Override
+        public void loadAttachmentCallback(MessagingException result, long messageId,
+                long attachmentId, int progress) {
+            if (messageId == mMessageId) {
+                if (result == null) {
+                    switch (progress) {
+                        case 0:
+                            enableAttachments(false);
+                            mCallback.onFetchAttachmentStarted(mLoadAttachmentName);
+                            Utility.showToast(getActivity(),
+                                    R.string.message_view_fetching_attachment_toast);
+                            break;
+                        case 100:
+                            enableAttachments(true);
+                            mCallback.onFetchAttachmentFinished();
+                            updateAttachmentThumbnail(attachmentId);
+                            doFinishLoadAttachment(attachmentId);
+                            break;
+                        default:
+                            // do nothing - we don't have a progress bar at this time
+                            break;
+                    }
+                } else {
+                    enableAttachments(true);
+                    mCallback.onFetchAttachmentError();
+                    Utility.showToast(getActivity(), R.string.status_network_error);
+                }
+            }
+        }
+
+        private void enableAttachments(boolean enable) {
+            for (int i = 0, count = mAttachments.getChildCount(); i < count; i++) {
+                AttachmentInfo attachment = (AttachmentInfo) mAttachments.getChildAt(i).getTag();
+                attachment.viewButton.setEnabled(enable);
+                attachment.downloadButton.setEnabled(enable);
+            }
+        }
+
+        @Override
+        public void updateMailboxCallback(MessagingException result, long accountId,
+                long mailboxId, int progress, int numNewMessages) {
+            if (result != null || progress == 100) {
+                Email.updateMailboxRefreshTime(mailboxId);
+            }
+        }
+    }
+}