From db370c5b40d33ab8e14d52f5d33ac44e3e960166 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 22 Sep 2012 01:25:43 +0200
Subject: [PATCH 1/6] Removed unused layout

---
 .../message_view_bottom_buttons.xml           | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 res/layout-land/message_view_bottom_buttons.xml

diff --git a/res/layout-land/message_view_bottom_buttons.xml b/res/layout-land/message_view_bottom_buttons.xml
deleted file mode 100644
index a27a88b1f..000000000
--- a/res/layout-land/message_view_bottom_buttons.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-<LinearLayout
-        android:id="@+id/bottom_buttons"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="57dip"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical">
-        <Button
-            android:id="@+id/previous"
-            android:text="@string/message_view_prev_action"
-            android:contentDescription="@string/previous_action"
-            android:textSize="35dip"
-            android:layout_height="wrap_content"
-            android:padding="0dip"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/reply"
-            android:text="@string/reply_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/delete"
-            android:text="@string/delete_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/forward"
-            android:text="@string/forward_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-         <Button
-            android:id="@+id/next"
-            android:text="@string/message_view_next_action"
-            android:contentDescription="@string/next_action"
-            android:textSize="35dip"
-            android:padding="0dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-</merge>

From c6bea2e6ab6e46a9abd9bba82b8a5e7dfa9300f0 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 24 Sep 2012 00:13:06 +0200
Subject: [PATCH 2/6] Copied ...activity.MessageView to
 fragment.MessageViewFragment

This commit breaks all sorts of things but should retain the Git
history of MessageView.
---
 .../MessageView.java => fragment/MessageViewFragment.java}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/com/fsck/k9/{activity/MessageView.java => fragment/MessageViewFragment.java} (99%)

diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
similarity index 99%
rename from src/com/fsck/k9/activity/MessageView.java
rename to src/com/fsck/k9/fragment/MessageViewFragment.java
index 4fd8d94f8..66db2963b 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.activity;
+package com.fsck.k9.fragment;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,7 +46,7 @@ import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
 import com.fsck.k9.view.MessageTitleView;
 import com.fsck.k9.view.SingleMessageView;
 
-public class MessageView extends K9Activity implements OnClickListener {
+public class MessageViewFragment extends K9Activity implements OnClickListener {
     private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
     private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
     private static final String EXTRA_MESSAGE_LIST_EXTRAS = "com.fsck.k9.MessageView_messageListExtras";

From bbcc4988ba52ca5e8212a73444913d35c23cebc4 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 26 Sep 2012 18:03:14 +0200
Subject: [PATCH 3/6] Converted message view to a fragment

The fragment should be fully functional. The only thing missing is the
animation when showing the next/previous message.
---
 res/layout/message_view.xml                   |   4 +-
 res/menu/message_view_fragment.xml            |  68 ++
 res/menu/message_view_option.xml              |  65 --
 .../fsck/k9/activity/K9FragmentActivity.java  | 230 +++++
 src/com/fsck/k9/activity/MessageView.java     | 564 ++++++++++++
 src/com/fsck/k9/crypto/Apg.java               |  62 +-
 src/com/fsck/k9/crypto/CryptoProvider.java    |   9 +-
 src/com/fsck/k9/crypto/None.java              |  10 +-
 .../fragment/ConfirmationDialogFragment.java  |  95 ++
 .../fsck/k9/fragment/MessageViewFragment.java | 844 ++++++------------
 .../k9/fragment/ProgressDialogFragment.java   |  35 +
 src/com/fsck/k9/helper/FileBrowserHelper.java |  33 +
 src/com/fsck/k9/view/MessageCryptoView.java   |  12 +-
 src/com/fsck/k9/view/SingleMessageView.java   |   8 +-
 14 files changed, 1386 insertions(+), 653 deletions(-)
 create mode 100644 res/menu/message_view_fragment.xml
 create mode 100644 src/com/fsck/k9/activity/K9FragmentActivity.java
 create mode 100644 src/com/fsck/k9/activity/MessageView.java
 create mode 100644 src/com/fsck/k9/fragment/ConfirmationDialogFragment.java
 create mode 100644 src/com/fsck/k9/fragment/ProgressDialogFragment.java

diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 29cb23973..666f274f9 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@id/message"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-
-    <include layout="@layout/message"/>
-
 </LinearLayout>
diff --git a/res/menu/message_view_fragment.xml b/res/menu/message_view_fragment.xml
new file mode 100644
index 000000000..10e3ceb46
--- /dev/null
+++ b/res/menu/message_view_fragment.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/delete"
+        android:alphabeticShortcut="q"
+        android:title="@string/delete_action"
+        android:icon="?attr/iconActionDelete"
+        android:showAsAction="always"
+    />
+    <item
+        android:id="@+id/single_message_options"
+        android:icon="?attr/iconActionSingleMessageOptions"
+        android:showAsAction="ifRoom"
+        android:title="@string/single_message_options_action">
+        <menu>
+            <item
+                android:id="@+id/reply"
+                android:title="@string/reply_action"/>
+            <item
+                android:id="@+id/reply_all"
+                android:title="@string/reply_all_action"/>
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward_action"/>
+            <item
+                android:id="@+id/share"
+                android:title="@string/send_alternate_action" />
+        </menu>
+    </item>
+    <item
+        android:id="@+id/archive"
+        android:title="@string/archive_action"
+        android:icon="?attr/iconActionArchive"
+        android:showAsAction="ifRoom"
+    />
+    <item
+        android:id="@+id/spam"
+        android:title="@string/spam_action"
+        android:icon="?attr/iconActionSpam"
+        android:showAsAction="ifRoom"
+    />
+    <item
+        android:id="@+id/move"
+            android:showAsAction="ifRoom"
+                android:icon="?attr/iconActionMoveOrCopy"
+        android:title="@string/move_action"
+    />
+    <item
+        android:id="@+id/copy"
+        android:title="@string/copy_action"
+    />
+    <item
+        android:id="@+id/toggle_unread"
+        android:alphabeticShortcut="u"
+        android:title="@string/mark_as_unread_action"
+        android:showAsAction="never"
+    />
+    <item
+        android:id="@+id/select_text"
+        android:title="@string/select_text_action"
+        android:showAsAction="never"
+    />
+    <item
+        android:id="@+id/toggle_message_view_theme"
+        android:title="@string/message_view_theme_action_dark"
+        android:showAsAction="never"
+    />
+</menu>
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index 87253641e..4c1512aa6 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -12,69 +12,4 @@
         android:icon="?attr/iconActionPreviousMessage"
         android:showAsAction="always"
     />
-    <item
-        android:id="@+id/delete"
-        android:alphabeticShortcut="q"
-        android:title="@string/delete_action"
-        android:icon="?attr/iconActionDelete"
-        android:showAsAction="always"
-    />
-    <item
-        android:id="@+id/single_message_options"
-        android:icon="?attr/iconActionSingleMessageOptions"
-        android:showAsAction="ifRoom"
-        android:title="@string/single_message_options_action">
-        <menu>
-            <item
-                android:id="@+id/reply"
-                android:title="@string/reply_action"/>
-            <item
-                android:id="@+id/reply_all"
-                android:title="@string/reply_all_action"/>
-            <item
-                android:id="@+id/forward"
-                android:title="@string/forward_action"/>
-            <item
-                android:id="@+id/share"
-                android:title="@string/send_alternate_action" />
-        </menu>
-    </item>
-    <item
-        android:id="@+id/archive"
-        android:title="@string/archive_action"
-        android:icon="?attr/iconActionArchive"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/spam"
-        android:title="@string/spam_action"
-        android:icon="?attr/iconActionSpam"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/move"
-            android:showAsAction="ifRoom"
-                android:icon="?attr/iconActionMoveOrCopy"
-        android:title="@string/move_action"
-    />
-    <item
-        android:id="@+id/copy"
-        android:title="@string/copy_action"
-    />
-    <item
-        android:id="@+id/toggle_unread"
-        android:alphabeticShortcut="u"
-        android:title="@string/mark_as_unread_action"
-        android:showAsAction="never"
-    />
-    <item
-        android:id="@+id/select_text"
-        android:title="@string/select_text_action"
-        android:showAsAction="never"
-    />
-    <item
-        android:id="@+id/toggle_message_view_theme"
-        android:title="@string/message_view_theme_action_dark"
-        android:showAsAction="never"
-    />
 </menu>
diff --git a/src/com/fsck/k9/activity/K9FragmentActivity.java b/src/com/fsck/k9/activity/K9FragmentActivity.java
new file mode 100644
index 000000000..b27db1ca6
--- /dev/null
+++ b/src/com/fsck/k9/activity/K9FragmentActivity.java
@@ -0,0 +1,230 @@
+package com.fsck.k9.activity;
+
+
+import java.util.Locale;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.MotionEvent;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.fsck.k9.K9;
+
+
+public class K9FragmentActivity extends SherlockFragmentActivity {
+    protected static final int BEZEL_SWIPE_THRESHOLD = 20;
+
+    protected GestureDetector mGestureDetector;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        setLanguage(this, K9.getK9Language());
+        setTheme(K9.getK9ThemeResourceId());
+        super.onCreate(icicle);
+        setupFormats();
+    }
+
+    public static void setLanguage(Context context, String language) {
+        Locale locale;
+        if (language == null || language.equals("")) {
+            locale = Locale.getDefault();
+        } else if (language.length() == 5 && language.charAt(2) == '_') {
+            // language is in the form: en_US
+            locale = new Locale(language.substring(0, 2), language.substring(3));
+        } else {
+            locale = new Locale(language);
+        }
+        Configuration config = new Configuration();
+        config.locale = locale;
+        context.getResources().updateConfiguration(config,
+                context.getResources().getDisplayMetrics());
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (mGestureDetector != null) {
+            mGestureDetector.onTouchEvent(ev);
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        setupFormats();
+    }
+
+    private java.text.DateFormat mTimeFormat;
+
+    private void setupFormats() {
+        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);   // 12/24 date format
+    }
+
+    public java.text.DateFormat getTimeFormat() {
+        return mTimeFormat;
+    }
+
+    /**
+     * Called when a swipe from right to left is handled by {@link MyGestureDetector}.  See
+     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
+     * for more information on the {@link MotionEvent}s being passed.
+     * @param e1 First down motion event that started the fling.
+     * @param e2 The move motion event that triggered the current onFling.
+     */
+    protected void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
+    }
+
+    /**
+     * Called when a swipe from left to right is handled by {@link MyGestureDetector}.  See
+     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
+     * for more information on the {@link MotionEvent}s being passed.
+     * @param e1 First down motion event that started the fling.
+     * @param e2 The move motion event that triggered the current onFling.
+     */
+    protected void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
+    }
+
+    protected Animation inFromRightAnimation() {
+        return slideAnimation(0.0f, +1.0f);
+    }
+
+    protected Animation outToLeftAnimation() {
+        return slideAnimation(0.0f, -1.0f);
+    }
+
+    private Animation slideAnimation(float right, float left) {
+
+        Animation slide = new TranslateAnimation(
+            Animation.RELATIVE_TO_PARENT,  right, Animation.RELATIVE_TO_PARENT,  left,
+            Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
+        );
+        slide.setDuration(125);
+        slide.setFillBefore(true);
+        slide.setInterpolator(new AccelerateInterpolator());
+        return slide;
+    }
+
+    class MyGestureDetector extends SimpleOnGestureListener {
+        private boolean gesturesEnabled = false;
+
+        /**
+         * Creates a new {@link android.view.GestureDetector.OnGestureListener}.  Enabled/disabled based upon
+         * {@link com.fsck.k9.K9#gesturesEnabled()}}.
+         */
+        public MyGestureDetector() {
+            super();
+        }
+
+        /**
+         * Create a new {@link android.view.GestureDetector.OnGestureListener}.
+         * @param gesturesEnabled Setting to <code>true</code> will enable gesture detection,
+         * regardless of the system-wide gesture setting.
+         */
+        public MyGestureDetector(final boolean gesturesEnabled) {
+            super();
+            this.gesturesEnabled = gesturesEnabled;
+        }
+
+        private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
+        private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
+
+
+        protected MotionEvent mLastOnDownEvent = null;
+
+        @Override
+        public boolean onDown(MotionEvent e) {
+            mLastOnDownEvent = e;
+            return super.onDown(e);
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            // Do fling-detection if gestures are force-enabled or we have system-wide gestures enabled.
+            if (gesturesEnabled || K9.gesturesEnabled()) {
+
+                // Apparently sometimes e1 is null
+                // Found a workaround here: http://stackoverflow.com/questions/4151385/
+                if (e1 == null) {
+                    e1 = mLastOnDownEvent;
+                }
+
+                // Make sure we avoid NullPointerExceptions
+                if (e1 == null || e2 == null) {
+                    return false;
+                }
+
+                // Calculate the minimum distance required for this to count as a swipe.
+                // Convert the constant dips to pixels.
+                final float mGestureScale = getResources().getDisplayMetrics().density;
+                final int minVelocity = (int)(SWIPE_THRESHOLD_VELOCITY_DIP * mGestureScale + 0.5f);
+                final int maxOffPath = (int)(SWIPE_MAX_OFF_PATH_DIP * mGestureScale + 0.5f);
+
+                // Calculate how much was actually swiped.
+                final float deltaX = e2.getX() - e1.getX();
+                final float deltaY = e2.getY() - e1.getY();
+
+                // Calculate the minimum distance required for this to be considered a swipe.
+                final int minDistance = (int)Math.abs(deltaY * 4);
+
+                if(K9.DEBUG) {
+                    final boolean movedAcross = (Math.abs(deltaX) > Math.abs(deltaY * 4));
+                    final boolean steadyHand = (Math.abs(deltaX / deltaY) > 2);
+                    Log.d(K9.LOG_TAG, String.format("Old swipe algorithm: movedAcross=%s steadyHand=%s result=%s", movedAcross, steadyHand, movedAcross && steadyHand));
+                    Log.d(K9.LOG_TAG, String.format("New swipe algorithm: deltaX=%.2f deltaY=%.2f minDistance=%d velocity=%.2f (min=%d)", deltaX, deltaY, minDistance, velocityX, minVelocity));
+                }
+
+                try {
+                    if (Math.abs(deltaY) > maxOffPath) {
+                        if(K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too far off horizontal path.");
+                        return false;
+                    }
+                    if(Math.abs(velocityX) < minVelocity) {
+                        if(K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too slow.");
+                        return false;
+                    }
+                    // right to left swipe
+                    if (deltaX < (minDistance * -1)) {
+                        onSwipeRightToLeft(e1, e2);
+                        if(K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "New swipe algorithm: Right to Left swipe OK.");
+                    } else if (deltaX > minDistance) {
+                        onSwipeLeftToRight(e1, e2);
+                        if(K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "New swipe algorithm: Left to Right swipe OK.");
+                    } else {
+                        if(K9.DEBUG)
+                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe did not meet minimum distance requirements.");
+                        return false;
+                    }
+
+                    // successful fling, cancel the 2nd event to prevent any other action from happening
+                    // see http://code.google.com/p/android/issues/detail?id=8497
+                    e2.setAction(MotionEvent.ACTION_CANCEL);
+                } catch (Exception e) {
+                    // nothing
+                }
+            }
+            return false;
+        }
+    }
+
+    public int getThemeBackgroundColor() {
+        TypedArray array = getTheme().obtainStyledAttributes(new int[] {
+            android.R.attr.colorBackground,
+        });
+        int backgroundColor = array.getColor(0, 0xFF00FF);
+        array.recycle();
+        return backgroundColor;
+    }
+
+}
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
new file mode 100644
index 000000000..7be0ddc50
--- /dev/null
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -0,0 +1,564 @@
+package com.fsck.k9.activity;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.Window;
+import com.fsck.k9.Account;
+import com.fsck.k9.K9;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
+import com.fsck.k9.crypto.PgpData;
+import com.fsck.k9.fragment.MessageViewFragment;
+import com.fsck.k9.fragment.MessageViewFragment.MessageViewFragmentListener;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.store.StorageManager;
+import com.fsck.k9.view.MessageHeader;
+import com.fsck.k9.view.MessageTitleView;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Toast;
+
+
+public class MessageView extends K9FragmentActivity implements MessageViewFragmentListener {
+
+    private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
+    private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
+    private static final String EXTRA_MESSAGE_LIST_EXTRAS = "com.fsck.k9.MessageView_messageListExtras";
+
+    /**
+     * @see #mLastDirection
+     */
+    private static final int PREVIOUS = 1;
+    private static final int NEXT = 2;
+
+
+    public static void actionView(Context context, MessageReference messRef,
+            ArrayList<MessageReference> messReferences, Bundle messageListExtras) {
+        Intent i = new Intent(context, MessageView.class);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        i.putExtra(EXTRA_MESSAGE_LIST_EXTRAS, messageListExtras);
+        i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef);
+        i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences);
+        context.startActivity(i);
+    }
+
+
+    private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
+    private Account mAccount;
+    private MessageTitleView mTitleView;
+    private MessageReference mMessageReference;
+    private ArrayList<MessageReference> mMessageReferences;
+    private int mLastDirection = (K9.messageViewShowNext()) ? NEXT : PREVIOUS;
+    private MessageReference mNextMessage;
+    private MessageReference mPreviousMessage;
+    private MessageViewFragment mMessageViewFragment;
+    private Menu mMenu;
+
+    /**
+     * Screen width in pixels.
+     *
+     * <p>
+     * Used to detect right-to-left bezel swipes.
+     * </p>
+     *
+     * @see #onSwipeRightToLeft(MotionEvent, MotionEvent)
+     */
+    private int mScreenWidthInPixels;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTheme(K9.getK9ThemeResourceId(K9.getK9MessageViewTheme()));
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+        setContentView(R.layout.message_view);
+
+        initializeActionBar();
+        setTitle("");
+
+        mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
+
+        // Enable gesture detection for MessageViews
+        mGestureDetector = new GestureDetector(new MyGestureDetector(false));
+
+        final Intent intent = getIntent();
+
+        Uri uri = intent.getData();
+        if (savedInstanceState != null) {
+            mMessageReference = savedInstanceState.getParcelable(EXTRA_MESSAGE_REFERENCE);
+            mMessageReferences = savedInstanceState.getParcelableArrayList(EXTRA_MESSAGE_REFERENCES);
+        } else {
+            if (uri == null) {
+                mMessageReference = intent.getParcelableExtra(EXTRA_MESSAGE_REFERENCE);
+                mMessageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES);
+            } else {
+                List<String> segmentList = uri.getPathSegments();
+                if (segmentList.size() != 3) {
+                    //TODO: Use resource to externalize message
+                    Toast.makeText(this, "Invalid intent uri: " + uri.toString(), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                String accountId = segmentList.get(0);
+                Collection<Account> accounts = Preferences.getPreferences(this).getAvailableAccounts();
+                for (Account account : accounts) {
+                    if (String.valueOf(account.getAccountNumber()).equals(accountId)) {
+                        mMessageReference = new MessageReference();
+                        mMessageReference.accountUuid = account.getUuid();
+                        mMessageReference.folderName = segmentList.get(1);
+                        mMessageReference.uid = segmentList.get(2);
+                        mMessageReferences = new ArrayList<MessageReference>();
+                        mAccount = account;
+                        break;
+                    }
+                }
+
+                if (mMessageReference == null) {
+                    //TODO: Use resource to externalize message
+                    Toast.makeText(this, "Invalid account id: " + accountId, Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+
+        if (mAccount == null) {
+            Preferences preferences = Preferences.getPreferences(getApplicationContext());
+            mAccount = preferences.getAccount(mMessageReference.accountUuid);
+        }
+
+        findSurroundingMessagesUid();
+
+
+        FragmentManager fragmentManager = getSupportFragmentManager();
+
+        mMessageViewFragment = (MessageViewFragment) fragmentManager.findFragmentById(R.id.message);
+
+        if (mMessageViewFragment == null) {
+            FragmentTransaction ft = fragmentManager.beginTransaction();
+            mMessageViewFragment = MessageViewFragment.newInstance(mMessageReference);
+            ft.add(R.id.message, mMessageViewFragment);
+            ft.commit();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (!mAccount.isAvailable(this)) {
+            onAccountUnavailable();
+            return;
+        }
+        StorageManager.getInstance(getApplication()).addListener(mStorageListener);
+    }
+
+    @Override
+    protected void onPause() {
+        StorageManager.getInstance(getApplication()).removeListener(mStorageListener);
+        super.onPause();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(EXTRA_MESSAGE_REFERENCE, mMessageReference);
+        outState.putParcelableArrayList(EXTRA_MESSAGE_REFERENCES, mMessageReferences);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+
+        getSupportMenuInflater().inflate(R.menu.message_view_option, menu);
+        mMenu = menu;
+        configureMenu(menu);
+
+        return true;
+    }
+
+    private void configureMenu(Menu menu) {
+        if (menu == null) {
+            return;
+        }
+
+        if (mNextMessage != null) {
+            menu.findItem(R.id.next_message).setEnabled(true);
+            menu.findItem(R.id.next_message).getIcon().setAlpha(255);
+        } else {
+            menu.findItem(R.id.next_message).getIcon().setAlpha(127);
+            menu.findItem(R.id.next_message).setEnabled(false);
+        }
+
+        if (mPreviousMessage != null) {
+            menu.findItem(R.id.previous_message).setEnabled(true);
+            menu.findItem(R.id.previous_message).getIcon().setAlpha(255);
+        } else {
+            menu.findItem(R.id.previous_message).getIcon().setAlpha(127);
+            menu.findItem(R.id.previous_message).setEnabled(false);
+        }
+    }
+
+    private void toggleActionsState(Menu menu, boolean state) {
+        for (int i = 0; i < menu.size(); ++i) {
+            menu.getItem(i).setEnabled(state);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home: {
+                finish();
+                break;
+            }
+            case R.id.next_message: {
+                onNext();
+                break;
+            }
+            case R.id.previous_message: {
+                onPrevious();
+                break;
+            }
+            default: {
+                return super.onOptionsItemSelected(item);
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        boolean ret = false;
+        if (KeyEvent.ACTION_DOWN == event.getAction()) {
+            ret = onCustomKeyDown(event.getKeyCode(), event);
+        }
+        if (!ret) {
+            ret = super.dispatchKeyEvent(event);
+        }
+        return ret;
+    }
+
+    /**
+     * Handle hotkeys
+     *
+     * <p>
+     * This method is called by {@link #dispatchKeyEvent(KeyEvent)} before any view had the chance
+     * to consume this key event.
+     * </p>
+     *
+     * @param keyCode
+     *         The value in {@code event.getKeyCode()}.
+     * @param event
+     *         Description of the key event.
+     *
+     * @return {@code true} if this event was consumed.
+     */
+    public boolean onCustomKeyDown(final int keyCode, final KeyEvent event) {
+        switch (keyCode) {
+        case KeyEvent.KEYCODE_VOLUME_UP: {
+            if (K9.useVolumeKeysForNavigationEnabled()) {
+                onNext();
+                return true;
+            }
+            break;
+        }
+        case KeyEvent.KEYCODE_VOLUME_DOWN: {
+            if (K9.useVolumeKeysForNavigationEnabled()) {
+                onPrevious();
+                return true;
+            }
+            break;
+        }
+        case KeyEvent.KEYCODE_DEL:
+        case KeyEvent.KEYCODE_D: {
+            mMessageViewFragment.onDelete();
+            return true;
+        }
+        case KeyEvent.KEYCODE_F: {
+            mMessageViewFragment.onForward();
+            return true;
+        }
+        case KeyEvent.KEYCODE_A: {
+            mMessageViewFragment.onReplyAll();
+            return true;
+        }
+        case KeyEvent.KEYCODE_R: {
+            mMessageViewFragment.onReply();
+            return true;
+        }
+        case KeyEvent.KEYCODE_G: {
+            mMessageViewFragment.onFlag();
+            return true;
+        }
+        case KeyEvent.KEYCODE_M: {
+            mMessageViewFragment.onMove();
+            return true;
+        }
+        case KeyEvent.KEYCODE_S: {
+            mMessageViewFragment.onRefile(mAccount.getSpamFolderName());
+            return true;
+        }
+        case KeyEvent.KEYCODE_V: {
+            mMessageViewFragment.onRefile(mAccount.getArchiveFolderName());
+            return true;
+        }
+        case KeyEvent.KEYCODE_Y: {
+            mMessageViewFragment.onCopy();
+            return true;
+        }
+        case KeyEvent.KEYCODE_J:
+        case KeyEvent.KEYCODE_P: {
+            onPrevious();
+            return true;
+        }
+        case KeyEvent.KEYCODE_N:
+        case KeyEvent.KEYCODE_K: {
+            onNext();
+            return true;
+        }
+        case KeyEvent.KEYCODE_Z: {
+            mMessageViewFragment.zoom(event);
+            return true;
+        }
+        case KeyEvent.KEYCODE_H: {
+            Toast toast = Toast.makeText(this, R.string.message_help_key, Toast.LENGTH_LONG);
+            toast.show();
+            return true;
+        }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        // Swallow these events too to avoid the audible notification of a volume change
+        if (K9.useVolumeKeysForNavigationEnabled()) {
+            if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
+                if (K9.DEBUG) {
+                    Log.v(K9.LOG_TAG, "Swallowed key up.");
+                }
+                return true;
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    protected void onAccountUnavailable() {
+        finish();
+        // TODO inform user about account unavailability using Toast
+        Accounts.listAccounts(this);
+    }
+
+    private void initializeActionBar() {
+        final ActionBar actionBar = getSupportActionBar();
+
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setCustomView(R.layout.actionbar_message_view);
+
+        final View customView = actionBar.getCustomView();
+        mTitleView = (MessageTitleView) customView.findViewById(android.R.id.title);
+    }
+
+    @Override
+    public void messageHeaderViewAvailable(MessageHeader header) {
+        mTitleView.setMessageHeader(header);
+    }
+
+    /**
+     * Set the title of the view.
+     *
+     * <p>Since we're using a custom ActionBar view, the normal {@code setTitle()} doesn't do what
+     * we think. This version sets the text value into the proper ActionBar title view.</p>
+     *
+     * @param title
+     *         Title to set.
+     */
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitleView.setText(title);
+    }
+
+    @Override
+    public void setProgress(boolean enable) {
+        setSupportProgressBarIndeterminateVisibility(enable);
+    }
+
+    /**
+     * Handle a right-to-left swipe starting at the edge of the screen as "move to next message."
+     */
+    @Override
+    protected void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
+        if ((int) e1.getRawX() > mScreenWidthInPixels - BEZEL_SWIPE_THRESHOLD) {
+            onNext();
+        }
+    }
+
+    /**
+     * Handle a left-to-right swipe starting at the edge of the screen as
+     * "move to previous message."
+     */
+    @Override
+    protected void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
+        if ((int) e1.getRawX() < BEZEL_SWIPE_THRESHOLD) {
+            onPrevious();
+        }
+    }
+
+    @Override
+    public void showNextMessageOrReturn() {
+        if (K9.messageViewReturnToList()) {
+            finish();
+        } else {
+            showNextMessage();
+        }
+    }
+
+    private void showNextMessage() {
+        findSurroundingMessagesUid();
+        mMessageReferences.remove(mMessageReference);
+        if (mLastDirection == NEXT && mNextMessage != null) {
+            onNext();
+        } else if (mLastDirection == PREVIOUS && mPreviousMessage != null) {
+            onPrevious();
+        } else if (mNextMessage != null) {
+            onNext();
+        } else if (mPreviousMessage != null) {
+            onPrevious();
+        } else {
+            finish();
+        }
+    }
+
+    protected void onNext() {
+        // Reset scroll percentage when we change messages
+        if (mNextMessage == null) {
+            Toast.makeText(this, getString(R.string.end_of_folder), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        mLastDirection = NEXT;
+        toggleActionsState(mMenu, false);
+//        if (K9.showAnimations()) {
+//            mMessageView.startAnimation(outToLeftAnimation());
+//        }
+        displayMessage(mNextMessage);
+    }
+
+    protected void onPrevious() {
+        // Reset scroll percentage when we change messages
+        if (mPreviousMessage == null) {
+            Toast.makeText(this, getString(R.string.end_of_folder), Toast.LENGTH_SHORT).show();
+            return;
+        }
+        mLastDirection = PREVIOUS;
+        toggleActionsState(mMenu, false);
+//        if (K9.showAnimations()) {
+//            mMessageView.startAnimation(inFromRightAnimation());
+//        }
+        displayMessage(mPreviousMessage);
+    }
+
+    private void displayMessage(MessageReference reference) {
+        mMessageReference = reference;
+        findSurroundingMessagesUid();
+        configureMenu(mMenu);
+        mMessageViewFragment.displayMessage(reference);
+    }
+
+
+    private void findSurroundingMessagesUid() {
+        mNextMessage = mPreviousMessage = null;
+
+        int i = mMessageReferences.indexOf(mMessageReference);
+        if (i < 0) {
+            return;
+        }
+
+        if (i != 0) {
+            mNextMessage = mMessageReferences.get(i - 1);
+        }
+
+        if (i != (mMessageReferences.size() - 1)) {
+            mPreviousMessage = mMessageReferences.get(i + 1);
+        }
+    }
+
+
+    private final class StorageListenerImplementation implements StorageManager.StorageListener {
+        @Override
+        public void onUnmount(String providerId) {
+            if (!providerId.equals(mAccount.getLocalStorageProviderId())) {
+                return;
+            }
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    onAccountUnavailable();
+                }
+            });
+        }
+
+        @Override
+        public void onMount(String providerId) { /* no-op */ }
+    }
+
+
+    @Override
+    public void restartActivity() {
+        // restart the current activity, so that the theme change can be applied
+        if (Build.VERSION.SDK_INT < 11) {
+            Intent intent = getIntent();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            finish();
+            overridePendingTransition(0, 0); // disable animations to speed up the switch
+            startActivity(intent);
+            overridePendingTransition(0, 0);
+        } else {
+            recreate();
+        }
+    }
+
+    @Override
+    public void displayMessageSubject(String subject) {
+        setTitle(subject);
+    }
+
+    @Override
+    public void onReply(Message message, PgpData pgpData) {
+        MessageCompose.actionReply(this, mAccount, message, false, pgpData.getDecryptedData());
+        finish();
+    }
+
+    @Override
+    public void onReplyAll(Message message, PgpData pgpData) {
+        MessageCompose.actionReply(this, mAccount, message, true, pgpData.getDecryptedData());
+        finish();
+    }
+
+    @Override
+    public void onForward(Message mMessage, PgpData mPgpData) {
+        MessageCompose.actionForward(this, mAccount, mMessage, mPgpData.getDecryptedData());
+        finish();
+    }
+}
diff --git a/src/com/fsck/k9/crypto/Apg.java b/src/com/fsck/k9/crypto/Apg.java
index 58af5ac49..e29db94eb 100644
--- a/src/com/fsck/k9/crypto/Apg.java
+++ b/src/com/fsck/k9/crypto/Apg.java
@@ -13,11 +13,11 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
+import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
 import com.fsck.k9.R;
 import com.fsck.k9.activity.MessageCompose;
-import com.fsck.k9.activity.MessageView;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
@@ -74,10 +74,11 @@ public class Apg extends CryptoProvider {
 
     public static final String INTENT_VERSION = "1";
 
-    public static final int DECRYPT_MESSAGE = 0x21070001;
-    public static final int ENCRYPT_MESSAGE = 0x21070002;
-    public static final int SELECT_PUBLIC_KEYS = 0x21070003;
-    public static final int SELECT_SECRET_KEY = 0x21070004;
+    // Note: The support package only allows us to use the lower 16 bits of a request code.
+    public static final int DECRYPT_MESSAGE = 0x0000A001;
+    public static final int ENCRYPT_MESSAGE = 0x0000A002;
+    public static final int SELECT_PUBLIC_KEYS = 0x0000A003;
+    public static final int SELECT_SECRET_KEY = 0x0000A004;
 
     public static Pattern PGP_MESSAGE =
         Pattern.compile(".*?(-----BEGIN PGP MESSAGE-----.*?-----END PGP MESSAGE-----).*",
@@ -406,21 +407,6 @@ public class Apg extends CryptoProvider {
             }
             break;
 
-        case Apg.DECRYPT_MESSAGE:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                break;
-            }
-
-            pgpData.setSignatureUserId(data.getStringExtra(Apg.EXTRA_SIGNATURE_USER_ID));
-            pgpData.setSignatureKeyId(data.getLongExtra(Apg.EXTRA_SIGNATURE_KEY_ID, 0));
-            pgpData.setSignatureSuccess(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_SUCCESS, false));
-            pgpData.setSignatureUnknown(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_UNKNOWN, false));
-
-            pgpData.setDecryptedData(data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE));
-            ((MessageView) activity).onDecryptDone(pgpData);
-
-            break;
-
         default:
             return false;
         }
@@ -428,6 +414,34 @@ public class Apg extends CryptoProvider {
         return true;
     }
 
+    @Override
+    public boolean onDecryptActivityResult(CryptoDecryptCallback callback, int requestCode,
+            int resultCode, android.content.Intent data, PgpData pgpData) {
+
+        switch (requestCode) {
+            case Apg.DECRYPT_MESSAGE: {
+                if (resultCode != Activity.RESULT_OK || data == null) {
+                    break;
+                }
+
+                pgpData.setSignatureUserId(data.getStringExtra(Apg.EXTRA_SIGNATURE_USER_ID));
+                pgpData.setSignatureKeyId(data.getLongExtra(Apg.EXTRA_SIGNATURE_KEY_ID, 0));
+                pgpData.setSignatureSuccess(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_SUCCESS, false));
+                pgpData.setSignatureUnknown(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_UNKNOWN, false));
+
+                pgpData.setDecryptedData(data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE));
+                callback.onDecryptDone(pgpData);
+
+                break;
+            }
+            default: {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Start the encrypt activity.
      *
@@ -458,13 +472,13 @@ public class Apg extends CryptoProvider {
     /**
      * Start the decrypt activity.
      *
-     * @param activity
+     * @param fragment
      * @param data
      * @param pgpData
      * @return success or failure
      */
     @Override
-    public boolean decrypt(Activity activity, String data, PgpData pgpData) {
+    public boolean decrypt(Fragment fragment, String data, PgpData pgpData) {
         android.content.Intent intent = new android.content.Intent(Apg.Intent.DECRYPT_AND_RETURN);
         intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
         intent.setType("text/plain");
@@ -473,10 +487,10 @@ public class Apg extends CryptoProvider {
         }
         try {
             intent.putExtra(EXTRA_TEXT, data);
-            activity.startActivityForResult(intent, Apg.DECRYPT_MESSAGE);
+            fragment.startActivityForResult(intent, Apg.DECRYPT_MESSAGE);
             return true;
         } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity, R.string.error_activity_not_found, Toast.LENGTH_SHORT).show();
+            Toast.makeText(fragment.getActivity(), R.string.error_activity_not_found, Toast.LENGTH_SHORT).show();
             return false;
         }
     }
diff --git a/src/com/fsck/k9/crypto/CryptoProvider.java b/src/com/fsck/k9/crypto/CryptoProvider.java
index 73ce8ba4d..8b6027a67 100644
--- a/src/com/fsck/k9/crypto/CryptoProvider.java
+++ b/src/com/fsck/k9/crypto/CryptoProvider.java
@@ -3,6 +3,7 @@ package com.fsck.k9.crypto;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.support.v4.app.Fragment;
 
 import com.fsck.k9.mail.Message;
 
@@ -19,10 +20,12 @@ abstract public class CryptoProvider {
     abstract public boolean isSigned(Message message);
     abstract public boolean onActivityResult(Activity activity, int requestCode, int resultCode,
             Intent data, PgpData pgpData);
+    abstract public boolean onDecryptActivityResult(CryptoDecryptCallback callback,
+            int requestCode, int resultCode, Intent data, PgpData pgpData);
     abstract public boolean selectSecretKey(Activity activity, PgpData pgpData);
     abstract public boolean selectEncryptionKeys(Activity activity, String emails, PgpData pgpData);
     abstract public boolean encrypt(Activity activity, String data, PgpData pgpData);
-    abstract public boolean decrypt(Activity activity, String data, PgpData pgpData);
+    abstract public boolean decrypt(Fragment fragment, String data, PgpData pgpData);
     abstract public long[] getSecretKeyIdsFromEmail(Context context, String email);
     abstract public long[] getPublicKeyIdsFromEmail(Context context, String email);
     abstract public boolean hasSecretKeyForEmail(Context context, String email);
@@ -38,4 +41,8 @@ abstract public class CryptoProvider {
 
         return None.createInstance();
     }
+
+    public interface CryptoDecryptCallback {
+        void onDecryptDone(PgpData pgpData);
+    }
 }
diff --git a/src/com/fsck/k9/crypto/None.java b/src/com/fsck/k9/crypto/None.java
index 2ce271e3d..1f5198c8d 100644
--- a/src/com/fsck/k9/crypto/None.java
+++ b/src/com/fsck/k9/crypto/None.java
@@ -2,6 +2,8 @@ package com.fsck.k9.crypto;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.Fragment;
 
 import com.fsck.k9.mail.Message;
 
@@ -63,13 +65,19 @@ public class None extends CryptoProvider {
         return false;
     }
 
+    @Override
+    public boolean onDecryptActivityResult(CryptoDecryptCallback callback, int requestCode,
+            int resultCode, Intent data, PgpData pgpData) {
+        return false;
+    }
+
     @Override
     public boolean encrypt(Activity activity, String data, PgpData pgpData) {
         return false;
     }
 
     @Override
-    public boolean decrypt(Activity activity, String data, PgpData pgpData) {
+    public boolean decrypt(Fragment fragment, String data, PgpData pgpData) {
         return false;
     }
 
diff --git a/src/com/fsck/k9/fragment/ConfirmationDialogFragment.java b/src/com/fsck/k9/fragment/ConfirmationDialogFragment.java
new file mode 100644
index 000000000..4ea8e29e9
--- /dev/null
+++ b/src/com/fsck/k9/fragment/ConfirmationDialogFragment.java
@@ -0,0 +1,95 @@
+package com.fsck.k9.fragment;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockDialogFragment;
+
+
+public class ConfirmationDialogFragment extends SherlockDialogFragment implements OnClickListener,
+        OnCancelListener {
+
+    private static final String ARG_DIALOG_ID = "dialog_id";
+    private static final String ARG_TITLE = "title";
+    private static final String ARG_MESSAGE = "message";
+    private static final String ARG_CONFIRM_TEXT = "confirm";
+    private static final String ARG_CANCEL_TEXT = "cancel";
+
+
+    public static ConfirmationDialogFragment newInstance(int dialogId, String title, String message,
+            String confirmText, String cancelText) {
+        ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
+
+        Bundle args = new Bundle();
+        args.putInt(ARG_DIALOG_ID, dialogId);
+        args.putString(ARG_TITLE, title);
+        args.putString(ARG_MESSAGE, message);
+        args.putString(ARG_CONFIRM_TEXT, confirmText);
+        args.putString(ARG_CANCEL_TEXT, cancelText);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
+
+    public interface ConfirmationDialogFragmentListener {
+        void doPositiveClick(int dialogId);
+        void doNegativeClick(int dialogId);
+        void dialogCancelled(int dialogId);
+    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        String title = args.getString(ARG_TITLE);
+        String message = args.getString(ARG_MESSAGE);
+        String confirmText = args.getString(ARG_CONFIRM_TEXT);
+        String cancelText = args.getString(ARG_CANCEL_TEXT);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(title);
+        builder.setMessage(message);
+        builder.setPositiveButton(confirmText, this);
+        builder.setNegativeButton(cancelText, this);
+
+        return builder.create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE: {
+                getListener().doPositiveClick(getDialogId());
+                break;
+            }
+            case DialogInterface.BUTTON_NEGATIVE: {
+                getListener().doNegativeClick(getDialogId());
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+        getListener().dialogCancelled(getDialogId());
+    }
+
+    private int getDialogId() {
+        return getArguments().getInt(ARG_DIALOG_ID);
+    }
+
+    private ConfirmationDialogFragmentListener getListener() {
+        try {
+            return (ConfirmationDialogFragmentListener) getTargetFragment();
+        } catch (ClassCastException e) {
+            throw new ClassCastException(getTargetFragment().getClass() +
+                    " must implement ConfirmationDialogFragmentListener");
+        }
+    }
+}
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index 66db2963b..cc487042c 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -1,12 +1,8 @@
 package com.fsck.k9.fragment;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences.Editor;
@@ -14,25 +10,31 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
 import android.util.Log;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.Window;
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
+import com.fsck.k9.activity.ChooseFolder;
+import com.fsck.k9.activity.MessageReference;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
+import com.fsck.k9.crypto.CryptoProvider.CryptoDecryptCallback;
 import com.fsck.k9.crypto.PgpData;
+import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 import com.fsck.k9.helper.FileBrowserHelper;
 import com.fsck.k9.helper.FileBrowserHelper.FileBrowserFailOverCallback;
 import com.fsck.k9.mail.Flag;
@@ -40,39 +42,45 @@ import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.store.LocalStore.LocalMessage;
-import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.view.AttachmentView;
 import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback;
-import com.fsck.k9.view.MessageTitleView;
+import com.fsck.k9.view.MessageHeader;
 import com.fsck.k9.view.SingleMessageView;
 
-public class MessageViewFragment extends K9Activity implements OnClickListener {
-    private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
-    private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
-    private static final String EXTRA_MESSAGE_LIST_EXTRAS = "com.fsck.k9.MessageView_messageListExtras";
+
+public class MessageViewFragment extends SherlockFragment implements OnClickListener,
+        CryptoDecryptCallback, ConfirmationDialogFragmentListener {
+
+    private static final String ARG_REFERENCE = "reference";
+
+    private static final String STATE_MESSAGE_REFERENCE = "reference";
     private static final String STATE_PGP_DATA = "pgpData";
+
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
     private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
 
-    private SingleMessageView mMessageView;
-    private MessageTitleView mTitleView;
 
+    public static MessageViewFragment newInstance(MessageReference reference) {
+        MessageViewFragment fragment = new MessageViewFragment();
+
+        Bundle args = new Bundle();
+        args.putParcelable(ARG_REFERENCE, reference);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
+
+    private SingleMessageView mMessageView;
     private PgpData mPgpData;
     private Menu mMenu;
     private Account mAccount;
     private MessageReference mMessageReference;
-    private ArrayList<MessageReference> mMessageReferences;
     private Message mMessage;
-    private static final int PREVIOUS = 1;
-    private static final int NEXT = 2;
-    private int mLastDirection = (K9.messageViewShowNext()) ? NEXT : PREVIOUS;
-    private MessagingController mController = MessagingController.getInstance(getApplication());
-    private MessageReference mNextMessage = null;
-    private MessageReference mPreviousMessage = null;
+    private MessagingController mController;
     private Listener mListener = new Listener();
     private MessageViewHandler mHandler = new MessageViewHandler();
-    private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
 
     private MenuItem mToggleMessageViewMenu;
 
@@ -88,179 +96,21 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
      */
     private String mDstFolder;
 
-    /**
-     * The extras used to create the {@link MessageList} instance that created this activity. May
-     * be {@code null}.
-     *
-     * @see MessageList#actionHandleFolder(Context, Bundle)
-     */
-    private Bundle mMessageListExtras;
+    private MessageViewFragmentListener mFragmentListener;
 
-    /**
-     * Screen width in pixels.
-     *
-     * <p>
-     * Used to detect right-to-left bezel swipes.
-     * </p>
-     *
-     * @see #onSwipeRightToLeft(MotionEvent, MotionEvent)
-     */
-    private int mScreenWidthInPixels;
-
-
-    private final class StorageListenerImplementation implements StorageManager.StorageListener {
-        @Override
-        public void onUnmount(String providerId) {
-            if (!providerId.equals(mAccount.getLocalStorageProviderId())) {
-                return;
-            }
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    onAccountUnavailable();
-                }
-            });
-        }
-
-        @Override
-        public void onMount(String providerId) { /* no-op */ }
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        boolean ret = false;
-        if (KeyEvent.ACTION_DOWN == event.getAction()) {
-            ret = onCustomKeyDown(event.getKeyCode(), event);
-        }
-        if (!ret) {
-            ret = super.dispatchKeyEvent(event);
-        }
-        return ret;
-    }
-
-    /**
-     * Handle hotkeys
-     *
-     * <p>
-     * This method is called by {@link #dispatchKeyEvent(KeyEvent)} before any view had the chance
-     * to consume this key event.
-     * </p>
-     *
-     * @param keyCode
-     *         The value in {@code event.getKeyCode()}.
-     * @param event
-     *         Description of the key event.
-     *
-     * @return {@code true} if this event was consumed.
-     */
-    public boolean onCustomKeyDown(final int keyCode, final KeyEvent event) {
-        switch (keyCode) {
-        case KeyEvent.KEYCODE_VOLUME_UP: {
-            if (K9.useVolumeKeysForNavigationEnabled()) {
-                onNext();
-                return true;
-            }
-            break;
-        }
-        case KeyEvent.KEYCODE_VOLUME_DOWN: {
-            if (K9.useVolumeKeysForNavigationEnabled()) {
-                onPrevious();
-                return true;
-            }
-            break;
-        }
-        case KeyEvent.KEYCODE_DEL: {
-            onDelete();
-            return true;
-        }
-        case KeyEvent.KEYCODE_D: {
-            onDelete();
-            return true;
-        }
-        case KeyEvent.KEYCODE_F: {
-            onForward();
-            return true;
-        }
-        case KeyEvent.KEYCODE_A: {
-            onReplyAll();
-            return true;
-        }
-        case KeyEvent.KEYCODE_R: {
-            onReply();
-            return true;
-        }
-        case KeyEvent.KEYCODE_G: {
-            onFlag();
-            return true;
-        }
-        case KeyEvent.KEYCODE_M: {
-            onMove();
-            return true;
-        }
-        case KeyEvent.KEYCODE_S: {
-            onRefile(mAccount.getSpamFolderName());
-            return true;
-        }
-        case KeyEvent.KEYCODE_V: {
-            onRefile(mAccount.getArchiveFolderName());
-            return true;
-        }
-        case KeyEvent.KEYCODE_Y: {
-            onCopy();
-            return true;
-        }
-        case KeyEvent.KEYCODE_J:
-        case KeyEvent.KEYCODE_P: {
-            onPrevious();
-            return true;
-        }
-        case KeyEvent.KEYCODE_N:
-        case KeyEvent.KEYCODE_K: {
-            onNext();
-            return true;
-        }
-        case KeyEvent.KEYCODE_Z: {
-            mHandler.post(new Runnable() {
-                public void run() {
-                    mMessageView.zoom(event);
-                }
-            });
-            return true;
-        }
-        case KeyEvent.KEYCODE_H: {
-            Toast toast = Toast.makeText(this, R.string.message_help_key, Toast.LENGTH_LONG);
-            toast.show();
-            return true;
-        }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        // Swallow these events too to avoid the audible notification of a volume change
-        if (K9.useVolumeKeysForNavigationEnabled()) {
-            if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
-                if (K9.DEBUG)
-                    Log.v(K9.LOG_TAG, "Swallowed key up.");
-                return true;
-            }
-        }
-        return super.onKeyUp(keyCode, event);
-    }
 
     class MessageViewHandler extends Handler {
 
         public void progress(final boolean progress) {
-            runOnUiThread(new Runnable() {
+            post(new Runnable() {
                 public void run() {
-                    setSupportProgressBarIndeterminateVisibility(progress);
+                    setProgress(progress);
                 }
             });
         }
 
         public void addAttachment(final View attachmentView) {
-            runOnUiThread(new Runnable() {
+            post(new Runnable() {
                 public void run() {
                     mMessageView.addAttachment(attachmentView);
                 }
@@ -269,9 +119,9 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
 
         /* A helper for a set of "show a toast" methods */
         private void showToast(final String message, final int toastLength)  {
-            runOnUiThread(new Runnable() {
+            post(new Runnable() {
                 public void run() {
-                    Toast.makeText(MessageView.this, message, toastLength).show();
+                    Toast.makeText(getActivity(), message, toastLength).show();
                 }
             });
         }
@@ -290,24 +140,36 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         }
     }
 
-    public static void actionView(Context context, MessageReference messRef,
-            ArrayList<MessageReference> messReferences, Bundle messageListExtras) {
-        Intent i = new Intent(context, MessageView.class);
-        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        i.putExtra(EXTRA_MESSAGE_LIST_EXTRAS, messageListExtras);
-        i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef);
-        i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences);
-        context.startActivity(i);
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        try {
+            mFragmentListener = (MessageViewFragmentListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.getClass() +
+                    " must implement MessageViewFragmentListener");
+        }
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setTheme(K9.getK9ThemeResourceId(K9.getK9MessageViewTheme()));
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.message_view);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-        mMessageView = (SingleMessageView) findViewById(R.id.message_view);
+        // This fragments adds options to the action bar
+        setHasOptionsMenu(true);
+
+        mController = MessagingController.getInstance(getActivity().getApplication());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.message, container, false);
+
+
+        mMessageView = (SingleMessageView) view.findViewById(R.id.message_view);
 
         //set a callback for the attachment view. With this callback the attachmentview
         //request the start of a filebrowser activity.
@@ -316,12 +178,13 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             @Override
             public void showFileBrowser(final AttachmentView caller) {
                 FileBrowserHelper.getInstance()
-                .showFileBrowserActivity(MessageView.this,
+                .showFileBrowserActivity(MessageViewFragment.this,
                                          null,
-                                         MessageView.ACTIVITY_CHOOSE_DIRECTORY,
+                                         ACTIVITY_CHOOSE_DIRECTORY,
                                          callback);
                 attachmentTmpStore = caller;
             }
+
             FileBrowserFailOverCallback callback = new FileBrowserFailOverCallback() {
 
                 @Override
@@ -338,99 +201,52 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
 
         mMessageView.initialize(this);
         mMessageView.downloadRemainderButton().setOnClickListener(this);
-        initializeActionBar();
 
-        setTitle("");
-        final Intent intent = getIntent();
+        mFragmentListener.messageHeaderViewAvailable(mMessageView.getMessageHeaderView());
 
-        mMessageListExtras = intent.getParcelableExtra(EXTRA_MESSAGE_LIST_EXTRAS);
-
-        Uri uri = intent.getData();
-        if (icicle != null) {
-            // TODO This code seems unnecessary since the icicle should already be thawed in onRestoreInstanceState().
-            mMessageReference = icicle.getParcelable(EXTRA_MESSAGE_REFERENCE);
-            mMessageReferences = icicle.getParcelableArrayList(EXTRA_MESSAGE_REFERENCES);
-            mPgpData = (PgpData) icicle.getSerializable(STATE_PGP_DATA);
-        } else {
-            if (uri == null) {
-                mMessageReference = intent.getParcelableExtra(EXTRA_MESSAGE_REFERENCE);
-                mMessageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES);
-            } else {
-                List<String> segmentList = uri.getPathSegments();
-                if (segmentList.size() != 3) {
-                    //TODO: Use resource to externalize message
-                    Toast.makeText(this, "Invalid intent uri: " + uri.toString(), Toast.LENGTH_LONG).show();
-                    return;
-                }
-
-                String accountId = segmentList.get(0);
-                Collection<Account> accounts = Preferences.getPreferences(this).getAvailableAccounts();
-                boolean found = false;
-                for (Account account : accounts) {
-                    if (String.valueOf(account.getAccountNumber()).equals(accountId)) {
-                        mAccount = account;
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    //TODO: Use resource to externalize message
-                    Toast.makeText(this, "Invalid account id: " + accountId, Toast.LENGTH_LONG).show();
-                    return;
-                }
-
-                mMessageReference = new MessageReference();
-                mMessageReference.accountUuid = mAccount.getUuid();
-                mMessageReference.folderName = segmentList.get(1);
-                mMessageReference.uid = segmentList.get(2);
-                mMessageReferences = new ArrayList<MessageReference>();
-            }
-        }
-
-        mAccount = Preferences.getPreferences(this).getAccount(mMessageReference.accountUuid);
-        mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
-
-        // Enable gesture detection for MessageViews
-        mGestureDetector = new GestureDetector(new MyGestureDetector(false));
-
-        displayMessage(mMessageReference);
+        return view;
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        MessageReference messageReference;
+        if (savedInstanceState != null) {
+            mPgpData = (PgpData) savedInstanceState.get(STATE_PGP_DATA);
+            messageReference = (MessageReference) savedInstanceState.get(STATE_MESSAGE_REFERENCE);
+        } else {
+            Bundle args = getArguments();
+            messageReference = (MessageReference) args.getParcelable(ARG_REFERENCE);
+        }
+
+        displayMessage(messageReference, (mPgpData == null));
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(EXTRA_MESSAGE_REFERENCE, mMessageReference);
-        outState.putParcelableArrayList(EXTRA_MESSAGE_REFERENCES, mMessageReferences);
+        outState.putParcelable(STATE_MESSAGE_REFERENCE, mMessageReference);
         outState.putSerializable(STATE_PGP_DATA, mPgpData);
     }
 
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        mPgpData = (PgpData) savedInstanceState.getSerializable(STATE_PGP_DATA);
-        mMessageView.updateCryptoLayout(mAccount.getCryptoProvider(), mPgpData, mMessage);
+    public void displayMessage(MessageReference ref) {
+        displayMessage(ref, true);
     }
 
-    private void initializeActionBar() {
-        final ActionBar actionBar = getSupportActionBar();
-
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setDisplayShowCustomEnabled(true);
-        actionBar.setCustomView(R.layout.actionbar_message_view);
-
-        final View customView = actionBar.getCustomView();
-        mTitleView = (MessageTitleView) customView.findViewById(android.R.id.title);
-        mTitleView.setMessageHeader(mMessageView.getMessageHeaderView());
-    }
-
-    private void displayMessage(MessageReference ref) {
+    private void displayMessage(MessageReference ref, boolean resetPgpData) {
         mMessageReference = ref;
-        if (K9.DEBUG)
+        if (K9.DEBUG) {
             Log.d(K9.LOG_TAG, "MessageView displaying message " + mMessageReference);
-        mAccount = Preferences.getPreferences(this).getAccount(mMessageReference.accountUuid);
-        findSurroundingMessagesUid();
-        // start with fresh, empty PGP data
-        mPgpData = new PgpData();
+        }
+
+        Context appContext = getActivity().getApplicationContext();
+        mAccount = Preferences.getPreferences(appContext).getAccount(mMessageReference.accountUuid);
+
+        if (resetPgpData) {
+            // start with fresh, empty PGP data
+            mPgpData = new PgpData();
+        }
 
         // Clear previous message
         mMessageView.resetView();
@@ -440,43 +256,10 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         configureMenu(mMenu);
     }
 
-    private void findSurroundingMessagesUid() {
-        mNextMessage = mPreviousMessage = null;
-        int i = mMessageReferences.indexOf(mMessageReference);
-        if (i < 0)
-            return;
-        if (i != 0)
-            mNextMessage = mMessageReferences.get(i - 1);
-        if (i != (mMessageReferences.size() - 1))
-            mPreviousMessage = mMessageReferences.get(i + 1);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!mAccount.isAvailable(this)) {
-            onAccountUnavailable();
-            return;
-        }
-        StorageManager.getInstance(getApplication()).addListener(mStorageListener);
-    }
-
-    @Override
-    protected void onPause() {
-        StorageManager.getInstance(getApplication()).removeListener(mStorageListener);
-        super.onPause();
-    }
-
-    protected void onAccountUnavailable() {
-        finish();
-        // TODO inform user about account unavailability using Toast
-        Accounts.listAccounts(this);
-    }
-
     /**
      * Called from UI thread when user select Delete
      */
-    private void onDelete() {
+    public void onDelete() {
         if (K9.confirmDelete() || (K9.confirmDeleteStarred() && mMessage.isSet(Flag.FLAGGED))) {
             showDialog(R.id.dialog_confirm_delete);
         } else {
@@ -490,17 +273,17 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             // accidental clicks)
             mMenu.findItem(R.id.delete).setEnabled(false);
             Message messageToDelete = mMessage;
-            showNextMessageOrReturn();
+            mFragmentListener.showNextMessageOrReturn();
             mController.deleteMessages(new Message[] {messageToDelete}, null);
         }
     }
 
-    private void onRefile(String dstFolder) {
+    public void onRefile(String dstFolder) {
         if (!mController.isMoveCapable(mAccount)) {
             return;
         }
         if (!mController.isMoveCapable(mMessage)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
+            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
             toast.show();
             return;
         }
@@ -520,57 +303,29 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
     private void refileMessage(String dstFolder) {
         String srcFolder = mMessageReference.folderName;
         Message messageToMove = mMessage;
-        showNextMessageOrReturn();
+        mFragmentListener.showNextMessageOrReturn();
         mController.moveMessage(mAccount, srcFolder, messageToMove, dstFolder, null);
     }
 
-    private void showNextMessageOrReturn() {
-        if (K9.messageViewReturnToList()) {
-            finish();
-        } else {
-            showNextMessage();
-        }
-    }
-
-    private void showNextMessage() {
-        findSurroundingMessagesUid();
-        mMessageReferences.remove(mMessageReference);
-        if (mLastDirection == NEXT && mNextMessage != null) {
-            onNext();
-        } else if (mLastDirection == PREVIOUS && mPreviousMessage != null) {
-            onPrevious();
-        } else if (mNextMessage != null) {
-            onNext();
-        } else if (mPreviousMessage != null) {
-            onPrevious();
-        } else {
-            finish();
-        }
-    }
-
-
-    private void onReply() {
+    public void onReply() {
         if (mMessage != null) {
-            MessageCompose.actionReply(this, mAccount, mMessage, false, mPgpData.getDecryptedData());
-            finish();
+            mFragmentListener.onReply(mMessage, mPgpData);
         }
     }
 
-    private void onReplyAll() {
+    public void onReplyAll() {
         if (mMessage != null) {
-            MessageCompose.actionReply(this, mAccount, mMessage, true, mPgpData.getDecryptedData());
-            finish();
+            mFragmentListener.onReplyAll(mMessage, mPgpData);
         }
     }
 
-    private void onForward() {
+    public void onForward() {
         if (mMessage != null) {
-            MessageCompose.actionForward(this, mAccount, mMessage, mPgpData.getDecryptedData());
-            finish();
+            mFragmentListener.onForward(mMessage, mPgpData);
         }
     }
 
-    private void onFlag() {
+    public void onFlag() {
         if (mMessage != null) {
             boolean newState = !mMessage.isSet(Flag.FLAGGED);
             mController.setFlag(mAccount, mMessage.getFolder().getName(),
@@ -579,27 +334,28 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         }
     }
 
-    private void onMove() {
+    public void onMove() {
         if ((!mController.isMoveCapable(mAccount))
                 || (mMessage == null)) {
             return;
         }
         if (!mController.isMoveCapable(mMessage)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
+            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
             toast.show();
             return;
         }
 
         startRefileActivity(ACTIVITY_CHOOSE_FOLDER_MOVE);
+
     }
 
-    private void onCopy() {
+    public void onCopy() {
         if ((!mController.isCopyCapable(mAccount))
                 || (mMessage == null)) {
             return;
         }
         if (!mController.isCopyCapable(mMessage)) {
-            Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
+            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
             toast.show();
             return;
         }
@@ -617,7 +373,8 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         new AsyncTask<Object, Object, Object>() {
             @Override
             protected Object doInBackground(Object... params) {
-                Preferences prefs = Preferences.getPreferences(getApplicationContext());
+                Context appContext = getActivity().getApplicationContext();
+                Preferences prefs = Preferences.getPreferences(appContext);
                 Editor editor = prefs.getPreferences().edit();
                 K9.save(editor);
                 editor.commit();
@@ -625,17 +382,11 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             }
         }.execute();
 
-        // restart the current activity, so that the theme change can be applied
-        Intent intent = getIntent();
-        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        finish();
-        overridePendingTransition(0, 0); // disable animations to speed up the switch
-        startActivity(intent);
-        overridePendingTransition(0, 0);
+        mFragmentListener.restartActivity();
     }
 
     private void startRefileActivity(int activity) {
-        Intent intent = new Intent(this, ChooseFolder.class);
+        Intent intent = new Intent(getActivity(), ChooseFolder.class);
         intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, mAccount.getUuid());
         intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, mMessageReference.folderName);
         intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, mAccount.getLastSelectedFolderName());
@@ -645,112 +396,69 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
 
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mAccount.getCryptoProvider().onActivityResult(this, requestCode, resultCode, data, mPgpData)) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (mAccount.getCryptoProvider().onDecryptActivityResult(this, requestCode, resultCode, data, mPgpData)) {
             return;
         }
-        if (resultCode != RESULT_OK)
+
+        if (resultCode != Activity.RESULT_OK) {
             return;
+        }
+
         switch (requestCode) {
-        case ACTIVITY_CHOOSE_DIRECTORY:
-            if (resultCode == RESULT_OK && data != null) {
-                // obtain the filename
-                Uri fileUri = data.getData();
-                if (fileUri != null) {
-                    String filePath = fileUri.getPath();
-                    if (filePath != null) {
-                        attachmentTmpStore.writeFile(new File(filePath));
+            case ACTIVITY_CHOOSE_DIRECTORY: {
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    // obtain the filename
+                    Uri fileUri = data.getData();
+                    if (fileUri != null) {
+                        String filePath = fileUri.getPath();
+                        if (filePath != null) {
+                            attachmentTmpStore.writeFile(new File(filePath));
+                        }
                     }
                 }
+                break;
             }
-
-            break;
-        case ACTIVITY_CHOOSE_FOLDER_MOVE:
-        case ACTIVITY_CHOOSE_FOLDER_COPY:
-            if (data == null)
-                return;
-            String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
-            String srcFolderName = data.getStringExtra(ChooseFolder.EXTRA_CUR_FOLDER);
-            MessageReference ref = data.getParcelableExtra(ChooseFolder.EXTRA_MESSAGE);
-            if (mMessageReference.equals(ref)) {
-                mAccount.setLastSelectedFolderName(destFolderName);
-                switch (requestCode) {
-                case ACTIVITY_CHOOSE_FOLDER_MOVE:
-                    Message messageToMove = mMessage;
-                    showNextMessageOrReturn();
-                    mController.moveMessage(mAccount, srcFolderName, messageToMove, destFolderName, null);
-                    break;
-                case ACTIVITY_CHOOSE_FOLDER_COPY:
-                    mController.copyMessage(mAccount, srcFolderName, mMessage, destFolderName, null);
-                    break;
+            case ACTIVITY_CHOOSE_FOLDER_MOVE:
+            case ACTIVITY_CHOOSE_FOLDER_COPY: {
+                if (data == null) {
+                    return;
                 }
+
+                String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
+                MessageReference ref = data.getParcelableExtra(ChooseFolder.EXTRA_MESSAGE);
+                if (mMessageReference.equals(ref)) {
+                    mAccount.setLastSelectedFolderName(destFolderName);
+                    switch (requestCode) {
+                        case ACTIVITY_CHOOSE_FOLDER_MOVE: {
+                            mFragmentListener.showNextMessageOrReturn();
+                            moveMessage(ref, destFolderName);
+                            break;
+                        }
+                        case ACTIVITY_CHOOSE_FOLDER_COPY: {
+                            copyMessage(ref, destFolderName);
+                            break;
+                        }
+                    }
+                }
+                break;
             }
-            break;
         }
     }
 
     private void onSendAlternate() {
         if (mMessage != null) {
-            mController.sendAlternate(this, mAccount, mMessage);
+            mController.sendAlternate(getActivity(), mAccount, mMessage);
         }
     }
 
-    /**
-     * Handle a right-to-left swipe starting at the edge of the screen as "move to next message."
-     */
-    @Override
-    protected void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
-        if ((int) e1.getRawX() > mScreenWidthInPixels - BEZEL_SWIPE_THRESHOLD) {
-            onNext();
-        }
-    }
-
-    /**
-     * Handle a left-to-right swipe starting at the edge of the screen as
-     * "move to previous message."
-     */
-    @Override
-    protected void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
-        if ((int) e1.getRawX() < BEZEL_SWIPE_THRESHOLD) {
-            onPrevious();
-        }
-    }
-
-    protected void onNext() {
-        // Reset scroll percentage when we change messages
-        if (mNextMessage == null) {
-            Toast.makeText(this, getString(R.string.end_of_folder), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        mLastDirection = NEXT;
-        //toggleActionsState(mMenu, false);
-        if (K9.showAnimations()) {
-            mMessageView.startAnimation(outToLeftAnimation());
-        }
-        displayMessage(mNextMessage);
-    }
-
-    protected void onPrevious() {
-        // Reset scroll percentage when we change messages
-        if (mPreviousMessage == null) {
-            Toast.makeText(this, getString(R.string.end_of_folder), Toast.LENGTH_SHORT).show();
-            return;
-        }
-        mLastDirection = PREVIOUS;
-        //toggleActionsState(mMenu, false);
-        if (K9.showAnimations()) {
-            mMessageView.startAnimation(inFromRightAnimation());
-        }
-        displayMessage(mPreviousMessage);
-    }
-
     private void onToggleRead() {
         if (mMessage != null) {
             mController.setFlag(mAccount, mMessage.getFolder().getName(),
                     new Message[] { mMessage }, Flag.SEEN, !mMessage.isSet(Flag.SEEN));
             mMessageView.setHeaders(mMessage, mAccount);
             String subject = mMessage.getSubject();
-            setTitle(subject);
+            displayMessageSubject(subject);
             updateUnreadToggleTitle();
         }
     }
@@ -763,30 +471,23 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         mController.loadMessageForViewRemote(mAccount, mMessageReference.folderName, mMessageReference.uid, mListener);
     }
 
-
+    @Override
     public void onClick(View view) {
         switch (view.getId()) {
-        case R.id.download:
-            ((AttachmentView)view).saveFile();
-            break;
-        case R.id.download_remainder:
-            onDownloadRemainder();
-            break;
+            case R.id.download: {
+                ((AttachmentView)view).saveFile();
+                break;
+            }
+            case R.id.download_remainder: {
+                onDownloadRemainder();
+                break;
+            }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            break;
-        case R.id.next_message:
-            onNext();
-            break;
-        case R.id.previous_message:
-            onPrevious();
-            break;
         case R.id.delete:
             onDelete();
             break;
@@ -830,12 +531,9 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.message_view_option, menu);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.message_view_fragment, menu);
         mMenu = menu;
-        configureMenu(menu);
-        return true;
     }
 
     private void configureMenu(Menu menu) {
@@ -859,23 +557,6 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
 
         toggleActionsState(menu, true);
 
-        if (mNextMessage != null) {
-
-            menu.findItem(R.id.next_message).setEnabled(true);
-            menu.findItem(R.id.next_message).getIcon().setAlpha(255);
-        } else {
-            menu.findItem(R.id.next_message).getIcon().setAlpha(127);
-            menu.findItem(R.id.next_message).setEnabled(false);
-        }
-
-        if (mPreviousMessage != null) {
-            menu.findItem(R.id.previous_message).setEnabled(true);
-            menu.findItem(R.id.previous_message).getIcon().setAlpha(255);
-        } else {
-            menu.findItem(R.id.previous_message).getIcon().setAlpha(127);
-            menu.findItem(R.id.previous_message).setEnabled(false);
-        }
-
         updateUnreadToggleTitle();
 
         // comply with the setting
@@ -927,48 +608,26 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         }
     }
 
-    // TODO: when switching to API version 8, override onCreateDialog(int, Bundle)
-
-    /**
-     * @param id The id of the dialog.
-     * @return The dialog. If you return null, the dialog will not be created.
-     * @see android.app.Activity#onCreateDialog(int)
-     */
-    @Override
-    protected Dialog onCreateDialog(final int id) {
-        switch (id) {
-        case R.id.dialog_confirm_delete:
-            return ConfirmationDialog.create(this, id,
-                                             R.string.dialog_confirm_delete_title,
-                                             R.string.dialog_confirm_delete_message,
-                                             R.string.dialog_confirm_delete_confirm_button,
-                                             R.string.dialog_confirm_delete_cancel_button,
-            new Runnable() {
-                @Override
-                public void run() {
-                    delete();
-                }
-            });
-        case R.id.dialog_confirm_spam:
-            return ConfirmationDialog.create(this, id,
-                                             R.string.dialog_confirm_spam_title,
-                                             getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, 1),
-                                             R.string.dialog_confirm_spam_confirm_button,
-                                             R.string.dialog_confirm_spam_cancel_button,
-            new Runnable() {
-                @Override
-                public void run() {
-                    refileMessage(mDstFolder);
-                    mDstFolder = null;
-                }
-            });
-        case R.id.dialog_attachment_progress:
-            ProgressDialog d = new ProgressDialog(this);
-            d.setIndeterminate(true);
-            d.setTitle(R.string.dialog_attachment_progress_title);
-            return d;
+    private void setProgress(boolean enable) {
+        if (mFragmentListener != null) {
+            mFragmentListener.setProgress(enable);
         }
-        return super.onCreateDialog(id);
+    }
+
+    private void displayMessageSubject(String subject) {
+        if (mFragmentListener != null) {
+            mFragmentListener.displayMessageSubject(subject);
+        }
+    }
+
+    public void moveMessage(MessageReference reference, String destFolderName) {
+        mController.moveMessage(mAccount, mMessageReference.folderName, mMessage,
+                destFolderName, null);
+    }
+
+    public void copyMessage(MessageReference reference, String destFolderName) {
+        mController.copyMessage(mAccount, mMessageReference.folderName, mMessage,
+                destFolderName, null);
     }
 
     class Listener extends MessagingListener {
@@ -994,7 +653,7 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
              */
             final Message clonedMessage = message.clone();
 
-            runOnUiThread(new Runnable() {
+            mHandler.post(new Runnable() {
                 public void run() {
                     if (!clonedMessage.isSet(Flag.X_DOWNLOADED_FULL) &&
                             !clonedMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)) {
@@ -1004,9 +663,9 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
                     mMessageView.setHeaders(clonedMessage, account);
                     final String subject = clonedMessage.getSubject();
                     if (subject == null || subject.equals("")) {
-                        setTitle(getString(R.string.general_no_subject));
+                        displayMessageSubject(getString(R.string.general_no_subject));
                     } else {
-                        setTitle(clonedMessage.getSubject());
+                        displayMessageSubject(clonedMessage.getSubject());
                     }
                     mMessageView.setOnFlagListener(new OnClickListener() {
                         @Override
@@ -1027,7 +686,7 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
                 return;
             }
 
-            runOnUiThread(new Runnable() {
+            mHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     try {
@@ -1051,14 +710,13 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setSupportProgressBarIndeterminateVisibility(false);
+                    setProgress(false);
                     if (t instanceof IllegalArgumentException) {
                         mHandler.invalidIdError();
                     } else {
                         mHandler.networkError();
                     }
-                    if ((MessageView.this.mMessage == null) ||
-                    !MessageView.this.mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)) {
+                    if (mMessage == null || mMessage.isSet(Flag.X_DOWNLOADED_PARTIAL)) {
                         mMessageView.showStatusMessage(getString(R.string.webview_empty_message));
                     }
                 }
@@ -1073,7 +731,7 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setSupportProgressBarIndeterminateVisibility(false);
+                    setProgress(false);
                     mMessageView.setShowDownloadButton(message);
                 }
             });
@@ -1087,7 +745,7 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
             }
             mHandler.post(new Runnable() {
                 public void run() {
-                    setSupportProgressBarIndeterminateVisibility(true);
+                    setProgress(true);
                 }
             });
         }
@@ -1145,6 +803,7 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
     }
 
     // This REALLY should be in MessageCryptoView
+    @Override
     public void onDecryptDone(PgpData pgpData) {
         Account account = mAccount;
         LocalMessage message = (LocalMessage) mMessage;
@@ -1157,13 +816,100 @@ public class MessageViewFragment extends K9Activity implements OnClickListener {
         }
     }
 
-    /**
-     * Set the title of the view.  Since we're using a custom ActionBar view, the normal setTitle() doesn't do what we
-     * think.  This version sets the text value into the proper ActionBar title view.
-     * @param title Title to set.
-     */
+    private void showDialog(int dialogId) {
+        DialogFragment fragment;
+        switch (dialogId) {
+            case R.id.dialog_confirm_delete: {
+                String title = getString(R.string.dialog_confirm_delete_title);
+                String message = getString(R.string.dialog_confirm_delete_message);
+                String confirmText = getString(R.string.dialog_confirm_delete_confirm_button);
+                String cancelText = getString(R.string.dialog_confirm_delete_cancel_button);
+
+                fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
+                        confirmText, cancelText);
+                break;
+            }
+            case R.id.dialog_confirm_spam: {
+                String title = getString(R.string.dialog_confirm_spam_title);
+                String message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, 1);
+                String confirmText = getString(R.string.dialog_confirm_spam_confirm_button);
+                String cancelText = getString(R.string.dialog_confirm_spam_cancel_button);
+
+                fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
+                        confirmText, cancelText);
+                break;
+            }
+            case R.id.dialog_attachment_progress: {
+                String title = getString(R.string.dialog_attachment_progress_title);
+                fragment = ProgressDialogFragment.newInstance(title);
+                break;
+            }
+            default: {
+                throw new RuntimeException("Called showDialog(int) with unknown dialog id.");
+            }
+        }
+
+        fragment.setTargetFragment(this, dialogId);
+        fragment.show(getFragmentManager(), getDialogTag(dialogId));
+    }
+
+    private void removeDialog(int dialogId) {
+        FragmentManager fm = getFragmentManager();
+
+        // Make sure the "show dialog" transaction has been processed when we call
+        // findFragmentByTag() below. Otherwise the fragment won't be found and the dialog will
+        // never be dismissed.
+        fm.executePendingTransactions();
+
+        DialogFragment fragment = (DialogFragment) fm.findFragmentByTag(getDialogTag(dialogId));
+
+        if (fragment != null) {
+            fragment.dismiss();
+        }
+    }
+
+    private String getDialogTag(int dialogId) {
+        return String.format("dialog-%d", dialogId);
+    }
+
+    public void zoom(KeyEvent event) {
+        mMessageView.zoom(event);
+    }
+
     @Override
-    public void setTitle(CharSequence title) {
-        mTitleView.setText(title);
+    public void doPositiveClick(int dialogId) {
+        switch (dialogId) {
+            case R.id.dialog_confirm_delete: {
+                delete();
+                break;
+            }
+            case R.id.dialog_confirm_spam: {
+                refileMessage(mDstFolder);
+                mDstFolder = null;
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void doNegativeClick(int dialogId) {
+        /* do nothing */
+    }
+
+    @Override
+    public void dialogCancelled(int dialogId) {
+        /* do nothing */
+    }
+
+
+    public interface MessageViewFragmentListener {
+        public void onForward(Message mMessage, PgpData mPgpData);
+        public void onReplyAll(Message mMessage, PgpData mPgpData);
+        public void onReply(Message mMessage, PgpData mPgpData);
+        public void displayMessageSubject(String title);
+        public void setProgress(boolean b);
+        public void restartActivity();
+        public void showNextMessageOrReturn();
+        public void messageHeaderViewAvailable(MessageHeader messageHeaderView);
     }
 }
diff --git a/src/com/fsck/k9/fragment/ProgressDialogFragment.java b/src/com/fsck/k9/fragment/ProgressDialogFragment.java
new file mode 100644
index 000000000..671758a86
--- /dev/null
+++ b/src/com/fsck/k9/fragment/ProgressDialogFragment.java
@@ -0,0 +1,35 @@
+package com.fsck.k9.fragment;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockDialogFragment;
+
+
+public class ProgressDialogFragment extends SherlockDialogFragment {
+    private static final String ARG_TITLE = "title";
+
+    public static ProgressDialogFragment newInstance(String title) {
+        ProgressDialogFragment fragment = new ProgressDialogFragment();
+
+        Bundle args = new Bundle();
+        args.putString(ARG_TITLE, title);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        String title = args.getString(ARG_TITLE);
+
+        ProgressDialog dialog = new ProgressDialog(getActivity());
+        dialog.setIndeterminate(true);
+        dialog.setTitle(title);
+
+        return dialog;
+    }
+}
diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/src/com/fsck/k9/helper/FileBrowserHelper.java
index cf66f2629..44e9fedf4 100644
--- a/src/com/fsck/k9/helper/FileBrowserHelper.java
+++ b/src/com/fsck/k9/helper/FileBrowserHelper.java
@@ -8,6 +8,7 @@ import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v4.app.Fragment;
 import android.text.InputType;
 import android.widget.EditText;
 
@@ -104,6 +105,38 @@ public class FileBrowserHelper {
         return success;
     }
 
+    public boolean showFileBrowserActivity(Fragment c, File startPath, int requestcode, FileBrowserFailOverCallback callback) {
+        boolean success = false;
+
+        if (startPath == null) {
+            startPath = new File(K9.getAttachmentDefaultPath());
+        }
+
+        int listIndex = 0;
+        do {
+            String intentAction = PICK_DIRECTORY_INTENTS[listIndex][0];
+            String uriPrefix = PICK_DIRECTORY_INTENTS[listIndex][1];
+            Intent intent = new Intent(intentAction);
+            intent.setData(Uri.parse(uriPrefix + startPath.getPath()));
+
+            try {
+                c.startActivityForResult(intent, requestcode);
+                success = true;
+            } catch (ActivityNotFoundException e) {
+                // Try the next intent in the list
+                listIndex++;
+            }
+        } while (!success && (listIndex < PICK_DIRECTORY_INTENTS.length));
+
+        if (listIndex == PICK_DIRECTORY_INTENTS.length) {
+            //No Filebrowser is installed => show a fallback textdialog
+            showPathTextInput(c.getActivity(), startPath, callback);
+            success = false;
+        }
+
+        return success;
+    }
+
     private void showPathTextInput(final Activity c, final File startPath, final FileBrowserFailOverCallback callback) {
         AlertDialog.Builder alert = new AlertDialog.Builder(c);
 
diff --git a/src/com/fsck/k9/view/MessageCryptoView.java b/src/com/fsck/k9/view/MessageCryptoView.java
index 003787977..0d5c2bf5a 100644
--- a/src/com/fsck/k9/view/MessageCryptoView.java
+++ b/src/com/fsck/k9/view/MessageCryptoView.java
@@ -1,7 +1,7 @@
 package com.fsck.k9.view;
 
-import android.app.Activity;
 import android.content.Context;
+import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -16,12 +16,10 @@ import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeUtility;
 
 
-
-
 public class MessageCryptoView extends LinearLayout {
 
     private Context mContext;
-    private Activity mActivity;
+    private Fragment mFragment;
     private Button mDecryptButton;
     private LinearLayout mCryptoSignatureLayout = null;
     private ImageView mCryptoSignatureStatusImage = null;
@@ -43,8 +41,8 @@ public class MessageCryptoView extends LinearLayout {
         mDecryptButton = (Button) findViewById(R.id.btn_decrypt);
     }
 
-    public void setActivity(Activity activity) {
-        mActivity = activity;
+    public void setFragment(Fragment fragment) {
+        mFragment = fragment;
 
     }
 
@@ -110,7 +108,7 @@ public class MessageCryptoView extends LinearLayout {
                     if (part != null) {
                         data = MimeUtility.getTextFromPart(part);
                     }
-                    cryptoProvider.decrypt(mActivity, data, pgpData);
+                    cryptoProvider.decrypt(mFragment, data, pgpData);
                 } catch (MessagingException me) {
                     Log.e(K9.LOG_TAG, "Unable to decrypt email.", me);
                 }
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 4e32a6c71..c7ccdff8e 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -11,6 +11,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -108,7 +109,8 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     private String mText;
 
 
-    public void initialize(Activity activity) {
+    public void initialize(Fragment fragment) {
+        Activity activity = fragment.getActivity();
         mMessageContentView = (MessageWebView) findViewById(R.id.message_content);
         mAccessibleMessageContentView = (AccessibleWebView) findViewById(R.id.accessible_message_content);
         mMessageContentView.configure();
@@ -128,7 +130,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mShowHiddenAttachments = (Button) findViewById(R.id.show_hidden_attachments);
         mShowHiddenAttachments.setVisibility(View.GONE);
         mCryptoView = (MessageCryptoView) findViewById(R.id.layout_decrypt);
-        mCryptoView.setActivity(activity);
+        mCryptoView.setFragment(fragment);
         mCryptoView.setupChildViews();
         mShowPicturesAction = findViewById(R.id.show_pictures);
         mShowMessageAction = findViewById(R.id.show_message);
@@ -157,7 +159,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
             mHeaderPlaceHolder.removeView(mHeaderContainer);
             // the HTC version of WebView tries to force the background of the
             // titlebar, which is really unfair.
-            mHeaderContainer.setBackgroundColor(((K9Activity)activity).getThemeBackgroundColor());
+//            mHeaderContainer.setBackgroundColor(((K9Activity)activity).getThemeBackgroundColor());
 
             mTitleBarHeaderContainer = new LinearLayout(activity);
             mMessageContentView.setEmbeddedTitleBarCompat(mTitleBarHeaderContainer);

From 8a226972a545ef95f9edbe898e5f6423b4b1873f Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 27 Sep 2012 06:12:01 +0200
Subject: [PATCH 4/6] Extracted functionality common to most activities to
 K9ActivityCommon

---
 src/com/fsck/k9/activity/K9Activity.java      | 225 ++----------------
 .../fsck/k9/activity/K9ActivityCommon.java    | 115 +++++++++
 .../fsck/k9/activity/K9FragmentActivity.java  | 225 ++----------------
 src/com/fsck/k9/activity/K9ListActivity.java  | 116 ++++-----
 .../k9/activity/K9PreferenceActivity.java     |   3 +-
 src/com/fsck/k9/activity/MessageList.java     |  13 +-
 src/com/fsck/k9/activity/MessageView.java     |  27 ++-
 .../activity/misc/SwipeGestureDetector.java   |  32 +++
 src/com/fsck/k9/view/SingleMessageView.java   |   4 +-
 9 files changed, 261 insertions(+), 499 deletions(-)
 create mode 100644 src/com/fsck/k9/activity/K9ActivityCommon.java

diff --git a/src/com/fsck/k9/activity/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java
index afd9c5bf8..c1b35ce79 100644
--- a/src/com/fsck/k9/activity/K9Activity.java
+++ b/src/com/fsck/k9/activity/K9Activity.java
@@ -1,230 +1,37 @@
 package com.fsck.k9.activity;
 
-
-import java.util.Locale;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
 
 import com.actionbarsherlock.app.SherlockActivity;
-import com.fsck.k9.K9;
+import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 
 
-public class K9Activity extends SherlockActivity {
-    protected static final int BEZEL_SWIPE_THRESHOLD = 20;
+public class K9Activity extends SherlockActivity implements K9ActivityMagic {
+
+    private K9ActivityCommon mBase;
 
-    protected GestureDetector mGestureDetector;
 
     @Override
-    public void onCreate(Bundle icicle) {
-        setLanguage(this, K9.getK9Language());
-        setTheme(K9.getK9ThemeResourceId());
-        super.onCreate(icicle);
-        setupFormats();
-    }
-
-    public static void setLanguage(Context context, String language) {
-        Locale locale;
-        if (language == null || language.equals("")) {
-            locale = Locale.getDefault();
-        } else if (language.length() == 5 && language.charAt(2) == '_') {
-            // language is in the form: en_US
-            locale = new Locale(language.substring(0, 2), language.substring(3));
-        } else {
-            locale = new Locale(language);
-        }
-        Configuration config = new Configuration();
-        config.locale = locale;
-        context.getResources().updateConfiguration(config,
-                context.getResources().getDisplayMetrics());
+    public void onCreate(Bundle savedInstanceState) {
+        mBase = K9ActivityCommon.newInstance(this);
+        super.onCreate(savedInstanceState);
     }
 
     @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mGestureDetector != null) {
-            mGestureDetector.onTouchEvent(ev);
-        }
-        return super.dispatchTouchEvent(ev);
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        mBase.preDispatchTouchEvent(event);
+        return super.dispatchTouchEvent(event);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setupFormats();
-    }
-
-    private java.text.DateFormat mTimeFormat;
-
-    private void setupFormats() {
-        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);   // 12/24 date format
-    }
-
-    public java.text.DateFormat getTimeFormat() {
-        return mTimeFormat;
-    }
-
-    /**
-     * Called when a swipe from right to left is handled by {@link MyGestureDetector}.  See
-     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
-     * for more information on the {@link MotionEvent}s being passed.
-     * @param e1 First down motion event that started the fling.
-     * @param e2 The move motion event that triggered the current onFling.
-     */
-    protected void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
-    }
-
-    /**
-     * Called when a swipe from left to right is handled by {@link MyGestureDetector}.  See
-     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
-     * for more information on the {@link MotionEvent}s being passed.
-     * @param e1 First down motion event that started the fling.
-     * @param e2 The move motion event that triggered the current onFling.
-     */
-    protected void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
-    }
-
-    protected Animation inFromRightAnimation() {
-        return slideAnimation(0.0f, +1.0f);
-    }
-
-    protected Animation outToLeftAnimation() {
-        return slideAnimation(0.0f, -1.0f);
-    }
-
-    private Animation slideAnimation(float right, float left) {
-
-        Animation slide = new TranslateAnimation(
-            Animation.RELATIVE_TO_PARENT,  right, Animation.RELATIVE_TO_PARENT,  left,
-            Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
-        );
-        slide.setDuration(125);
-        slide.setFillBefore(true);
-        slide.setInterpolator(new AccelerateInterpolator());
-        return slide;
-    }
-
-    class MyGestureDetector extends SimpleOnGestureListener {
-        private boolean gesturesEnabled = false;
-
-        /**
-         * Creates a new {@link android.view.GestureDetector.OnGestureListener}.  Enabled/disabled based upon
-         * {@link com.fsck.k9.K9#gesturesEnabled()}}.
-         */
-        public MyGestureDetector() {
-            super();
-        }
-
-        /**
-         * Create a new {@link android.view.GestureDetector.OnGestureListener}.
-         * @param gesturesEnabled Setting to <code>true</code> will enable gesture detection,
-         * regardless of the system-wide gesture setting.
-         */
-        public MyGestureDetector(final boolean gesturesEnabled) {
-            super();
-            this.gesturesEnabled = gesturesEnabled;
-        }
-
-        private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
-        private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
-
-
-        protected MotionEvent mLastOnDownEvent = null;
-
-        @Override
-        public boolean onDown(MotionEvent e) {
-            mLastOnDownEvent = e;
-            return super.onDown(e);
-        }
-
-        @Override
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            // Do fling-detection if gestures are force-enabled or we have system-wide gestures enabled.
-            if (gesturesEnabled || K9.gesturesEnabled()) {
-
-                // Apparently sometimes e1 is null
-                // Found a workaround here: http://stackoverflow.com/questions/4151385/
-                if (e1 == null) {
-                    e1 = mLastOnDownEvent;
-                }
-
-                // Make sure we avoid NullPointerExceptions
-                if (e1 == null || e2 == null) {
-                    return false;
-                }
-
-                // Calculate the minimum distance required for this to count as a swipe.
-                // Convert the constant dips to pixels.
-                final float mGestureScale = getResources().getDisplayMetrics().density;
-                final int minVelocity = (int)(SWIPE_THRESHOLD_VELOCITY_DIP * mGestureScale + 0.5f);
-                final int maxOffPath = (int)(SWIPE_MAX_OFF_PATH_DIP * mGestureScale + 0.5f);
-
-                // Calculate how much was actually swiped.
-                final float deltaX = e2.getX() - e1.getX();
-                final float deltaY = e2.getY() - e1.getY();
-
-                // Calculate the minimum distance required for this to be considered a swipe.
-                final int minDistance = (int)Math.abs(deltaY * 4);
-
-                if(K9.DEBUG) {
-                    final boolean movedAcross = (Math.abs(deltaX) > Math.abs(deltaY * 4));
-                    final boolean steadyHand = (Math.abs(deltaX / deltaY) > 2);
-                    Log.d(K9.LOG_TAG, String.format("Old swipe algorithm: movedAcross=%s steadyHand=%s result=%s", movedAcross, steadyHand, movedAcross && steadyHand));
-                    Log.d(K9.LOG_TAG, String.format("New swipe algorithm: deltaX=%.2f deltaY=%.2f minDistance=%d velocity=%.2f (min=%d)", deltaX, deltaY, minDistance, velocityX, minVelocity));
-                }
-
-                try {
-                    if (Math.abs(deltaY) > maxOffPath) {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too far off horizontal path.");
-                        return false;
-                    }
-                    if(Math.abs(velocityX) < minVelocity) {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too slow.");
-                        return false;
-                    }
-                    // right to left swipe
-                    if (deltaX < (minDistance * -1)) {
-                        onSwipeRightToLeft(e1, e2);
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Right to Left swipe OK.");
-                    } else if (deltaX > minDistance) {
-                        onSwipeLeftToRight(e1, e2);
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Left to Right swipe OK.");
-                    } else {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe did not meet minimum distance requirements.");
-                        return false;
-                    }
-
-                    // successful fling, cancel the 2nd event to prevent any other action from happening
-                    // see http://code.google.com/p/android/issues/detail?id=8497
-                    e2.setAction(MotionEvent.ACTION_CANCEL);
-                } catch (Exception e) {
-                    // nothing
-                }
-            }
-            return false;
-        }
-    }
-
     public int getThemeBackgroundColor() {
-        TypedArray array = getTheme().obtainStyledAttributes(new int[] {
-            android.R.attr.colorBackground,
-        });
-        int backgroundColor = array.getColor(0, 0xFF00FF);
-        array.recycle();
-        return backgroundColor;
+        return mBase.getThemeBackgroundColor();
     }
 
+    @Override
+    public void setupGestureDetector(OnSwipeGestureListener listener) {
+        mBase.setupGestureDetector(listener);
+    }
 }
diff --git a/src/com/fsck/k9/activity/K9ActivityCommon.java b/src/com/fsck/k9/activity/K9ActivityCommon.java
new file mode 100644
index 000000000..2dd65e9b7
--- /dev/null
+++ b/src/com/fsck/k9/activity/K9ActivityCommon.java
@@ -0,0 +1,115 @@
+package com.fsck.k9.activity;
+
+import java.util.Locale;
+
+import com.fsck.k9.K9;
+import com.fsck.k9.activity.misc.SwipeGestureDetector;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
+import com.fsck.k9.helper.StringUtils;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+
+
+/**
+ * This class implements functionality common to most activities used in K-9 Mail.
+ *
+ * @see K9Activity
+ * @see K9ListActivity
+ * @see K9FragmentActivity
+ */
+public class K9ActivityCommon {
+    /**
+     * Creates a new instance of {@link K9ActivityCommon} bound to the specified activity.
+     *
+     * @param activity
+     *         The {@link Activity} the returned {@code K9ActivityCommon} instance will be bound to.
+     *
+     * @return The {@link K9ActivityCommon} instance that will provide the base functionality of the
+     *         "K9" activities.
+     */
+    public static K9ActivityCommon newInstance(Activity activity) {
+        return new K9ActivityCommon(activity);
+    }
+
+    public static void setLanguage(Activity activity, String language) {
+        Locale locale;
+        if (StringUtils.isNullOrEmpty(language)) {
+            locale = Locale.getDefault();
+        } else if (language.length() == 5 && language.charAt(2) == '_') {
+            // language is in the form: en_US
+            locale = new Locale(language.substring(0, 2), language.substring(3));
+        } else {
+            locale = new Locale(language);
+        }
+
+        Configuration config = new Configuration();
+        config.locale = locale;
+        Resources resources = activity.getResources();
+        resources.updateConfiguration(config, resources.getDisplayMetrics());
+    }
+
+
+    /**
+     * Base activities need to implement this interface.
+     *
+     * <p>The implementing class simply has to call through to the implementation of these methods
+     * in {@link K9ActivityCommon}.</p>
+     */
+    public interface K9ActivityMagic {
+        int getThemeBackgroundColor();
+        void setupGestureDetector(OnSwipeGestureListener listener);
+    }
+
+
+    private Activity mActivity;
+    private GestureDetector mGestureDetector;
+
+
+    private K9ActivityCommon(Activity activity) {
+        mActivity = activity;
+        setLanguage(mActivity, K9.getK9Language());
+        mActivity.setTheme(K9.getK9ThemeResourceId());
+    }
+
+    /**
+     * Call this before calling {@code super.dispatchTouchEvent(MotionEvent)}.
+     */
+    public void preDispatchTouchEvent(MotionEvent event) {
+        if (mGestureDetector != null) {
+            mGestureDetector.onTouchEvent(event);
+        }
+    }
+
+    /**
+     * Get the background color of the theme used for this activity.
+     *
+     * @return The background color of the current theme.
+     */
+    public int getThemeBackgroundColor() {
+        TypedArray array = mActivity.getTheme().obtainStyledAttributes(
+                new int[] { android.R.attr.colorBackground });
+
+        int backgroundColor = array.getColor(0, 0xFF00FF);
+
+        array.recycle();
+
+        return backgroundColor;
+    }
+
+    /**
+     * Call this if you wish to use the swipe gesture detector.
+     *
+     * @param listener
+     *         A listener that will be notified if a left to right or right to left swipe has been
+     *         detected.
+     */
+    public void setupGestureDetector(OnSwipeGestureListener listener) {
+        mGestureDetector = new GestureDetector(mActivity,
+                new SwipeGestureDetector(mActivity, listener));
+    }
+}
diff --git a/src/com/fsck/k9/activity/K9FragmentActivity.java b/src/com/fsck/k9/activity/K9FragmentActivity.java
index b27db1ca6..289765b0c 100644
--- a/src/com/fsck/k9/activity/K9FragmentActivity.java
+++ b/src/com/fsck/k9/activity/K9FragmentActivity.java
@@ -1,230 +1,37 @@
 package com.fsck.k9.activity;
 
-
-import java.util.Locale;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.fsck.k9.K9;
+import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 
 
-public class K9FragmentActivity extends SherlockFragmentActivity {
-    protected static final int BEZEL_SWIPE_THRESHOLD = 20;
+public class K9FragmentActivity extends SherlockFragmentActivity implements K9ActivityMagic {
+
+    private K9ActivityCommon mBase;
 
-    protected GestureDetector mGestureDetector;
 
     @Override
-    public void onCreate(Bundle icicle) {
-        setLanguage(this, K9.getK9Language());
-        setTheme(K9.getK9ThemeResourceId());
-        super.onCreate(icicle);
-        setupFormats();
-    }
-
-    public static void setLanguage(Context context, String language) {
-        Locale locale;
-        if (language == null || language.equals("")) {
-            locale = Locale.getDefault();
-        } else if (language.length() == 5 && language.charAt(2) == '_') {
-            // language is in the form: en_US
-            locale = new Locale(language.substring(0, 2), language.substring(3));
-        } else {
-            locale = new Locale(language);
-        }
-        Configuration config = new Configuration();
-        config.locale = locale;
-        context.getResources().updateConfiguration(config,
-                context.getResources().getDisplayMetrics());
+    public void onCreate(Bundle savedInstanceState) {
+        mBase = K9ActivityCommon.newInstance(this);
+        super.onCreate(savedInstanceState);
     }
 
     @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mGestureDetector != null) {
-            mGestureDetector.onTouchEvent(ev);
-        }
-        return super.dispatchTouchEvent(ev);
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        mBase.preDispatchTouchEvent(event);
+        return super.dispatchTouchEvent(event);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        setupFormats();
-    }
-
-    private java.text.DateFormat mTimeFormat;
-
-    private void setupFormats() {
-        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);   // 12/24 date format
-    }
-
-    public java.text.DateFormat getTimeFormat() {
-        return mTimeFormat;
-    }
-
-    /**
-     * Called when a swipe from right to left is handled by {@link MyGestureDetector}.  See
-     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
-     * for more information on the {@link MotionEvent}s being passed.
-     * @param e1 First down motion event that started the fling.
-     * @param e2 The move motion event that triggered the current onFling.
-     */
-    protected void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
-    }
-
-    /**
-     * Called when a swipe from left to right is handled by {@link MyGestureDetector}.  See
-     * {@link android.view.GestureDetector.OnGestureListener#onFling(android.view.MotionEvent, android.view.MotionEvent, float, float)}
-     * for more information on the {@link MotionEvent}s being passed.
-     * @param e1 First down motion event that started the fling.
-     * @param e2 The move motion event that triggered the current onFling.
-     */
-    protected void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
-    }
-
-    protected Animation inFromRightAnimation() {
-        return slideAnimation(0.0f, +1.0f);
-    }
-
-    protected Animation outToLeftAnimation() {
-        return slideAnimation(0.0f, -1.0f);
-    }
-
-    private Animation slideAnimation(float right, float left) {
-
-        Animation slide = new TranslateAnimation(
-            Animation.RELATIVE_TO_PARENT,  right, Animation.RELATIVE_TO_PARENT,  left,
-            Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
-        );
-        slide.setDuration(125);
-        slide.setFillBefore(true);
-        slide.setInterpolator(new AccelerateInterpolator());
-        return slide;
-    }
-
-    class MyGestureDetector extends SimpleOnGestureListener {
-        private boolean gesturesEnabled = false;
-
-        /**
-         * Creates a new {@link android.view.GestureDetector.OnGestureListener}.  Enabled/disabled based upon
-         * {@link com.fsck.k9.K9#gesturesEnabled()}}.
-         */
-        public MyGestureDetector() {
-            super();
-        }
-
-        /**
-         * Create a new {@link android.view.GestureDetector.OnGestureListener}.
-         * @param gesturesEnabled Setting to <code>true</code> will enable gesture detection,
-         * regardless of the system-wide gesture setting.
-         */
-        public MyGestureDetector(final boolean gesturesEnabled) {
-            super();
-            this.gesturesEnabled = gesturesEnabled;
-        }
-
-        private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
-        private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
-
-
-        protected MotionEvent mLastOnDownEvent = null;
-
-        @Override
-        public boolean onDown(MotionEvent e) {
-            mLastOnDownEvent = e;
-            return super.onDown(e);
-        }
-
-        @Override
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            // Do fling-detection if gestures are force-enabled or we have system-wide gestures enabled.
-            if (gesturesEnabled || K9.gesturesEnabled()) {
-
-                // Apparently sometimes e1 is null
-                // Found a workaround here: http://stackoverflow.com/questions/4151385/
-                if (e1 == null) {
-                    e1 = mLastOnDownEvent;
-                }
-
-                // Make sure we avoid NullPointerExceptions
-                if (e1 == null || e2 == null) {
-                    return false;
-                }
-
-                // Calculate the minimum distance required for this to count as a swipe.
-                // Convert the constant dips to pixels.
-                final float mGestureScale = getResources().getDisplayMetrics().density;
-                final int minVelocity = (int)(SWIPE_THRESHOLD_VELOCITY_DIP * mGestureScale + 0.5f);
-                final int maxOffPath = (int)(SWIPE_MAX_OFF_PATH_DIP * mGestureScale + 0.5f);
-
-                // Calculate how much was actually swiped.
-                final float deltaX = e2.getX() - e1.getX();
-                final float deltaY = e2.getY() - e1.getY();
-
-                // Calculate the minimum distance required for this to be considered a swipe.
-                final int minDistance = (int)Math.abs(deltaY * 4);
-
-                if(K9.DEBUG) {
-                    final boolean movedAcross = (Math.abs(deltaX) > Math.abs(deltaY * 4));
-                    final boolean steadyHand = (Math.abs(deltaX / deltaY) > 2);
-                    Log.d(K9.LOG_TAG, String.format("Old swipe algorithm: movedAcross=%s steadyHand=%s result=%s", movedAcross, steadyHand, movedAcross && steadyHand));
-                    Log.d(K9.LOG_TAG, String.format("New swipe algorithm: deltaX=%.2f deltaY=%.2f minDistance=%d velocity=%.2f (min=%d)", deltaX, deltaY, minDistance, velocityX, minVelocity));
-                }
-
-                try {
-                    if (Math.abs(deltaY) > maxOffPath) {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too far off horizontal path.");
-                        return false;
-                    }
-                    if(Math.abs(velocityX) < minVelocity) {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe too slow.");
-                        return false;
-                    }
-                    // right to left swipe
-                    if (deltaX < (minDistance * -1)) {
-                        onSwipeRightToLeft(e1, e2);
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Right to Left swipe OK.");
-                    } else if (deltaX > minDistance) {
-                        onSwipeLeftToRight(e1, e2);
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Left to Right swipe OK.");
-                    } else {
-                        if(K9.DEBUG)
-                            Log.d(K9.LOG_TAG, "New swipe algorithm: Swipe did not meet minimum distance requirements.");
-                        return false;
-                    }
-
-                    // successful fling, cancel the 2nd event to prevent any other action from happening
-                    // see http://code.google.com/p/android/issues/detail?id=8497
-                    e2.setAction(MotionEvent.ACTION_CANCEL);
-                } catch (Exception e) {
-                    // nothing
-                }
-            }
-            return false;
-        }
-    }
-
     public int getThemeBackgroundColor() {
-        TypedArray array = getTheme().obtainStyledAttributes(new int[] {
-            android.R.attr.colorBackground,
-        });
-        int backgroundColor = array.getColor(0, 0xFF00FF);
-        array.recycle();
-        return backgroundColor;
+        return mBase.getThemeBackgroundColor();
     }
 
+    @Override
+    public void setupGestureDetector(OnSwipeGestureListener listener) {
+        mBase.setupGestureDetector(listener);
+    }
 }
diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java
index 91427e505..9c37a58e6 100644
--- a/src/com/fsck/k9/activity/K9ListActivity.java
+++ b/src/com/fsck/k9/activity/K9ListActivity.java
@@ -1,7 +1,7 @@
 package com.fsck.k9.activity;
 
-import android.util.Log;
-import android.view.GestureDetector;
+import java.text.DateFormat;
+
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.widget.AdapterView;
@@ -10,94 +10,96 @@ import android.os.Bundle;
 
 import com.actionbarsherlock.app.SherlockListActivity;
 import com.fsck.k9.K9;
+import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 import com.fsck.k9.helper.DateFormatter;
 
-public class K9ListActivity extends SherlockListActivity {
-    protected GestureDetector mGestureDetector;
+
+public class K9ListActivity extends SherlockListActivity implements K9ActivityMagic {
+
+    private K9ActivityCommon mBase;
+    private DateFormat mDateFormat;
+    private DateFormat mTimeFormat;
+
 
     @Override
-    public void onCreate(Bundle icicle) {
-        K9Activity.setLanguage(this, K9.getK9Language());
-        setTheme(K9.getK9ThemeResourceId());
-        super.onCreate(icicle);
+    public void onCreate(Bundle savedInstanceState) {
+        mBase = K9ActivityCommon.newInstance(this);
+        super.onCreate(savedInstanceState);
         setupFormats();
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        mBase.preDispatchTouchEvent(event);
+        return super.dispatchTouchEvent(event);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
         setupFormats();
     }
 
-    private java.text.DateFormat mDateFormat;
-    private java.text.DateFormat mTimeFormat;
-
-    private void setupFormats() {
-        mDateFormat = DateFormatter.getDateFormat(this);
-        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);   // 12/24 date format
+    public DateFormat getDateFormat() {
+        return mDateFormat;
     }
 
-    public java.text.DateFormat getTimeFormat() {
+    public DateFormat getTimeFormat() {
         return mTimeFormat;
     }
 
-    public java.text.DateFormat getDateFormat() {
-        return mDateFormat;
+    private void setupFormats() {
+        mTimeFormat = android.text.format.DateFormat.getTimeFormat(this);
+        mDateFormat = DateFormatter.getDateFormat(this);
+    }
+
+    @Override
+    public int getThemeBackgroundColor() {
+        return mBase.getThemeBackgroundColor();
+    }
+
+    @Override
+    public void setupGestureDetector(OnSwipeGestureListener listener) {
+        mBase.setupGestureDetector(listener);
     }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         // Shortcuts that work no matter what is selected
-        switch (keyCode) {
-        case KeyEvent.KEYCODE_VOLUME_UP: {
-            final ListView listView = getListView();
-            if (K9.useVolumeKeysForListNavigationEnabled()) {
-                int currentPosition = listView.getSelectedItemPosition();
-                if (currentPosition == AdapterView.INVALID_POSITION || listView.isInTouchMode()) {
-                    currentPosition = listView.getFirstVisiblePosition();
-                }
-                if (currentPosition > 0) {
-                    listView.setSelection(currentPosition - 1);
-                }
-                return true;
-            }
-        }
-        case KeyEvent.KEYCODE_VOLUME_DOWN: {
-            final ListView listView = getListView();
-            if (K9.useVolumeKeysForListNavigationEnabled()) {
-                int currentPosition = listView.getSelectedItemPosition();
-                if (currentPosition == AdapterView.INVALID_POSITION || listView.isInTouchMode()) {
-                    currentPosition = listView.getFirstVisiblePosition();
-                }
+        if (K9.useVolumeKeysForListNavigationEnabled() &&
+                (keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+                keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
 
-                if (currentPosition < listView.getCount()) {
-                    listView.setSelection(currentPosition + 1);
-                }
-                return true;
+            final ListView listView = getListView();
+
+            int currentPosition = listView.getSelectedItemPosition();
+            if (currentPosition == AdapterView.INVALID_POSITION || listView.isInTouchMode()) {
+                currentPosition = listView.getFirstVisiblePosition();
             }
+
+            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && currentPosition > 0) {
+                listView.setSelection(currentPosition - 1);
+            } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN &&
+                    currentPosition < listView.getCount()) {
+                listView.setSelection(currentPosition + 1);
+            }
+
+            return true;
         }
-        }
+
         return super.onKeyDown(keyCode, event);
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         // Swallow these events too to avoid the audible notification of a volume change
-        if (K9.useVolumeKeysForListNavigationEnabled()) {
-            if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
-                if (K9.DEBUG)
-                    Log.v(K9.LOG_TAG, "Swallowed key up.");
-                return true;
-            }
+        if (K9.useVolumeKeysForListNavigationEnabled() &&
+                (keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+                keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
+            return true;
         }
+
         return super.onKeyUp(keyCode, event);
     }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mGestureDetector != null) {
-            mGestureDetector.onTouchEvent(ev);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
 }
diff --git a/src/com/fsck/k9/activity/K9PreferenceActivity.java b/src/com/fsck/k9/activity/K9PreferenceActivity.java
index 1b83b68f4..d30cf9d63 100644
--- a/src/com/fsck/k9/activity/K9PreferenceActivity.java
+++ b/src/com/fsck/k9/activity/K9PreferenceActivity.java
@@ -12,7 +12,7 @@ import android.preference.Preference;
 public class K9PreferenceActivity extends SherlockPreferenceActivity {
     @Override
     public void onCreate(Bundle icicle) {
-        K9Activity.setLanguage(this, K9.getK9Language());
+        K9ActivityCommon.setLanguage(this, K9.getK9Language());
 
         if (Build.VERSION.SDK_INT >= 6 && Build.VERSION.SDK_INT < 14) {
             // There's a display bug in all supported Android versions before 4.0 (SDK 14) which
@@ -88,5 +88,4 @@ public class K9PreferenceActivity extends SherlockPreferenceActivity {
             return false;
         }
     }
-
 }
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index ca5d3f261..dee923870 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -30,22 +30,23 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.*;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.BaseAdapter;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.internal.view.menu.MenuBuilder;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -59,14 +60,12 @@ import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.SearchSpecification;
-import com.fsck.k9.activity.misc.SwipeGestureDetector;
 import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
 import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.helper.MenuPopup;
 import com.fsck.k9.helper.MessageHelper;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Flag;
@@ -724,7 +723,7 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
         mListView.setVerticalFadingEdgeEnabled(false);
 
         // Enable gesture detection for MessageLists
-        mGestureDetector = new GestureDetector(new SwipeGestureDetector(this, this));
+        setupGestureDetector(this);
 
         // Correcting for screen rotation when in ActionMode
         mSelectedCount = getSelectionFromCheckboxes().size();
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 7be0ddc50..760e37fac 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -12,6 +12,8 @@ import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
+import com.fsck.k9.activity.misc.SwipeGestureDetector;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
 import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.fragment.MessageViewFragment;
 import com.fsck.k9.fragment.MessageViewFragment.MessageViewFragmentListener;
@@ -28,14 +30,14 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
 
 
-public class MessageView extends K9FragmentActivity implements MessageViewFragmentListener {
+public class MessageView extends K9FragmentActivity implements MessageViewFragmentListener,
+        OnSwipeGestureListener {
 
     private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
     private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
@@ -71,15 +73,11 @@ public class MessageView extends K9FragmentActivity implements MessageViewFragme
     private Menu mMenu;
 
     /**
-     * Screen width in pixels.
-     *
-     * <p>
      * Used to detect right-to-left bezel swipes.
-     * </p>
      *
      * @see #onSwipeRightToLeft(MotionEvent, MotionEvent)
      */
-    private int mScreenWidthInPixels;
+    private int mRightBezelThreshold;
 
 
     @Override
@@ -92,10 +90,13 @@ public class MessageView extends K9FragmentActivity implements MessageViewFragme
         initializeActionBar();
         setTitle("");
 
-        mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
+        int screenWidth = getResources().getDisplayMetrics().widthPixels;
+        mRightBezelThreshold = screenWidth - SwipeGestureDetector.BEZEL_SWIPE_THRESHOLD;
 
         // Enable gesture detection for MessageViews
-        mGestureDetector = new GestureDetector(new MyGestureDetector(false));
+        if (K9.gesturesEnabled()) {
+            setupGestureDetector(this);
+        }
 
         final Intent intent = getIntent();
 
@@ -409,8 +410,8 @@ public class MessageView extends K9FragmentActivity implements MessageViewFragme
      * Handle a right-to-left swipe starting at the edge of the screen as "move to next message."
      */
     @Override
-    protected void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
-        if ((int) e1.getRawX() > mScreenWidthInPixels - BEZEL_SWIPE_THRESHOLD) {
+    public void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
+        if ((int) e1.getRawX() > mRightBezelThreshold) {
             onNext();
         }
     }
@@ -420,8 +421,8 @@ public class MessageView extends K9FragmentActivity implements MessageViewFragme
      * "move to previous message."
      */
     @Override
-    protected void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
-        if ((int) e1.getRawX() < BEZEL_SWIPE_THRESHOLD) {
+    public void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
+        if ((int) e1.getRawX() < SwipeGestureDetector.BEZEL_SWIPE_THRESHOLD) {
             onPrevious();
         }
     }
diff --git a/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java b/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java
index f020e41fc..db77ee5d9 100644
--- a/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java
+++ b/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java
@@ -2,18 +2,23 @@ package com.fsck.k9.activity.misc;
 
 import android.content.Context;
 import android.view.MotionEvent;
+import android.view.GestureDetector.OnGestureListener;
 import android.view.GestureDetector.SimpleOnGestureListener;
 
 
 public class SwipeGestureDetector extends SimpleOnGestureListener {
+    public static final int BEZEL_SWIPE_THRESHOLD = 20;
+
     private static final float SWIPE_MAX_OFF_PATH_DIP = 250f;
     private static final float SWIPE_THRESHOLD_VELOCITY_DIP = 325f;
 
+
     private final OnSwipeGestureListener mListener;
     private int mMinVelocity;
     private int mMaxOffPath;
     private MotionEvent mLastOnDownEvent = null;
 
+
     public SwipeGestureDetector(Context context, OnSwipeGestureListener listener) {
         super();
 
@@ -80,8 +85,35 @@ public class SwipeGestureDetector extends SimpleOnGestureListener {
     }
 
 
+    /**
+     * A listener that will be notified when a right to left or left to right swipe has been
+     * detected.
+     */
     public interface OnSwipeGestureListener {
+        /**
+         * Called when a swipe from right to left is handled by {@link MyGestureDetector}.
+         *
+         * <p>See {@link OnGestureListener#onFling(MotionEvent, MotionEvent, float, float)}
+         * for more information on the {@link MotionEvent}s being passed.</p>
+         *
+         * @param e1
+         *         First down motion event that started the fling.
+         * @param e2
+         *         The move motion event that triggered the current onFling.
+         */
         void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2);
+
+        /**
+         * Called when a swipe from left to right is handled by {@link MyGestureDetector}.
+         *
+         * <p>See {@link OnGestureListener#onFling(MotionEvent, MotionEvent, float, float)}
+         * for more information on the {@link MotionEvent}s being passed.</p>
+         *
+         * @param e1
+         *         First down motion event that started the fling.
+         * @param e2
+         *         The move motion event that triggered the current onFling.
+         */
         void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2);
     }
 }
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index c7ccdff8e..2344782cf 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -32,7 +32,7 @@ import android.widget.Toast;
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
-import com.fsck.k9.activity.K9Activity;
+import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.crypto.CryptoProvider;
@@ -159,7 +159,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
             mHeaderPlaceHolder.removeView(mHeaderContainer);
             // the HTC version of WebView tries to force the background of the
             // titlebar, which is really unfair.
-//            mHeaderContainer.setBackgroundColor(((K9Activity)activity).getThemeBackgroundColor());
+            mHeaderContainer.setBackgroundColor(((K9ActivityMagic)activity).getThemeBackgroundColor());
 
             mTitleBarHeaderContainer = new LinearLayout(activity);
             mMessageContentView.setEmbeddedTitleBarCompat(mTitleBarHeaderContainer);

From 12e9dce1d82929fe4dad7227602088b4dc7775db Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 27 Sep 2012 06:37:25 +0200
Subject: [PATCH 5/6] Renamed MessageList to MessageListFragment

---
 .../MessageList.java => fragment/MessageListFragment.java}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/com/fsck/k9/{activity/MessageList.java => fragment/MessageListFragment.java} (99%)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/fragment/MessageListFragment.java
similarity index 99%
rename from src/com/fsck/k9/activity/MessageList.java
rename to src/com/fsck/k9/fragment/MessageListFragment.java
index dee923870..458d17580 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.activity;
+package com.fsck.k9.fragment;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -85,7 +85,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
  * shows a list of messages.
  * From this Activity the user can perform all standard message operations.
  */
-public class MessageList extends K9ListActivity implements OnItemClickListener,
+public class MessageListFragment extends K9ListActivity implements OnItemClickListener,
         OnSwipeGestureListener {
 
     /**

From 93b13362b4a5558e04eb859b95eb3b4c5df7bdce Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 6 Oct 2012 03:41:32 +0200
Subject: [PATCH 6/6] Converted message list to a fragment

---
 res/layout/message_list.xml                   |   16 +-
 res/layout/message_list_fragment.xml          |    9 +
 src/com/fsck/k9/activity/MessageCompose.java  |    5 +-
 src/com/fsck/k9/activity/MessageList.java     |  751 ++++++++++
 .../fsck/k9/fragment/MessageListFragment.java | 1301 +++++++----------
 src/com/fsck/k9/provider/MessageProvider.java |   51 +-
 6 files changed, 1321 insertions(+), 812 deletions(-)
 create mode 100644 res/layout/message_list_fragment.xml
 create mode 100644 src/com/fsck/k9/activity/MessageList.java

diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index babf79db1..614b22a1a 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/message_list_container"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="?android:attr/colorBackground">
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/message_list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:cacheColorHint="?android:attr/colorBackground"
-        android:layout_weight="5"
-
-    />
-</LinearLayout>
+    android:orientation="vertical" />
diff --git a/res/layout/message_list_fragment.xml b/res/layout/message_list_fragment.xml
new file mode 100644
index 000000000..0ae255fad
--- /dev/null
+++ b/res/layout/message_list_fragment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.handmark.pulltorefresh.library.PullToRefreshListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/message_list"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_weight="5"
+    android:background="?android:attr/colorBackground"
+    android:cacheColorHint="?android:attr/colorBackground" />
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index d7862a833..3b5e0589f 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -440,12 +440,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
      * Save will attempt to replace the message in the given folder with the updated version.
      * Discard will delete the message from the given folder.
      * @param context
-     * @param account
      * @param message
      */
-    public static void actionEditDraft(Context context, Account account, Message message) {
+    public static void actionEditDraft(Context context, MessageReference messageReference) {
         Intent i = new Intent(context, MessageCompose.class);
-        i.putExtra(EXTRA_MESSAGE_REFERENCE, message.makeMessageReference());
+        i.putExtra(EXTRA_MESSAGE_REFERENCE, messageReference);
         i.setAction(ACTION_EDIT_DRAFT);
         context.startActivity(i);
     }
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
new file mode 100644
index 000000000..8862314e9
--- /dev/null
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -0,0 +1,751 @@
+package com.fsck.k9.activity;
+
+import java.util.ArrayList;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
+import android.support.v4.app.FragmentTransaction;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.fsck.k9.Account;
+import com.fsck.k9.Account.SortType;
+import com.fsck.k9.K9;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
+import com.fsck.k9.SearchSpecification;
+import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
+import com.fsck.k9.activity.setup.AccountSettings;
+import com.fsck.k9.activity.setup.FolderSettings;
+import com.fsck.k9.activity.setup.Prefs;
+import com.fsck.k9.fragment.MessageListFragment;
+import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener;
+import com.fsck.k9.helper.Utility;
+import com.fsck.k9.mail.Flag;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.store.StorageManager;
+
+
+/**
+ * MessageList is the primary user interface for the program. This Activity
+ * shows a list of messages.
+ * From this Activity the user can perform all standard message operations.
+ */
+public class MessageList extends K9FragmentActivity implements MessageListFragmentListener,
+        OnBackStackChangedListener, OnSwipeGestureListener {
+    private static final String EXTRA_ACCOUNT = "account";
+    private static final String EXTRA_FOLDER  = "folder";
+    private static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
+    private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.search_folder";
+    private static final String EXTRA_QUERY_FLAGS = "queryFlags";
+    private static final String EXTRA_FORBIDDEN_FLAGS = "forbiddenFlags";
+    private static final String EXTRA_INTEGRATE = "integrate";
+    private static final String EXTRA_ACCOUNT_UUIDS = "accountUuids";
+    private static final String EXTRA_FOLDER_NAMES = "folderNames";
+    private static final String EXTRA_TITLE = "title";
+
+
+    public static void actionHandleFolder(Context context, Account account, String folder) {
+        Intent intent = new Intent(context, MessageList.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.putExtra(EXTRA_ACCOUNT, account.getUuid());
+
+        if (folder != null) {
+            intent.putExtra(EXTRA_FOLDER, folder);
+        }
+        context.startActivity(intent);
+    }
+
+    public static Intent actionHandleFolderIntent(Context context, Account account, String folder) {
+        Intent intent = new Intent(context, MessageList.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP |
+                Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.putExtra(EXTRA_ACCOUNT, account.getUuid());
+
+        if (folder != null) {
+            intent.putExtra(EXTRA_FOLDER, folder);
+        }
+        return intent;
+    }
+
+    public static void actionHandle(Context context, String title, String queryString, boolean integrate, Flag[] flags, Flag[] forbiddenFlags) {
+        Intent intent = new Intent(context, MessageList.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.putExtra(SearchManager.QUERY, queryString);
+        if (flags != null) {
+            intent.putExtra(EXTRA_QUERY_FLAGS, Utility.combine(flags, ','));
+        }
+        if (forbiddenFlags != null) {
+            intent.putExtra(EXTRA_FORBIDDEN_FLAGS, Utility.combine(forbiddenFlags, ','));
+        }
+        intent.putExtra(EXTRA_INTEGRATE, integrate);
+        intent.putExtra(EXTRA_TITLE, title);
+        context.startActivity(intent);
+    }
+
+    /**
+     * Creates and returns an intent that opens Unified Inbox or All Messages screen.
+     */
+    public static Intent actionHandleAccountIntent(Context context, String title,
+            SearchSpecification searchSpecification) {
+        Intent intent = new Intent(context, MessageList.class);
+        intent.putExtra(SearchManager.QUERY, searchSpecification.getQuery());
+        if (searchSpecification.getRequiredFlags() != null) {
+            intent.putExtra(EXTRA_QUERY_FLAGS, Utility.combine(searchSpecification.getRequiredFlags(), ','));
+        }
+        if (searchSpecification.getForbiddenFlags() != null) {
+            intent.putExtra(EXTRA_FORBIDDEN_FLAGS, Utility.combine(searchSpecification.getForbiddenFlags(), ','));
+        }
+        intent.putExtra(EXTRA_INTEGRATE, searchSpecification.isIntegrate());
+        intent.putExtra(EXTRA_ACCOUNT_UUIDS, searchSpecification.getAccountUuids());
+        intent.putExtra(EXTRA_FOLDER_NAMES, searchSpecification.getFolderNames());
+        intent.putExtra(EXTRA_TITLE, title);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+        return intent;
+    }
+
+    public static void actionHandle(Context context, String title,
+                                    SearchSpecification searchSpecification) {
+        Intent intent = actionHandleAccountIntent(context, title, searchSpecification);
+        context.startActivity(intent);
+    }
+
+
+    private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
+
+    private ActionBar mActionBar;
+    private TextView mActionBarTitle;
+    private TextView mActionBarSubTitle;
+    private TextView mActionBarUnread;
+    private String mTitle;
+    private Menu mMenu;
+
+    private MessageListFragment mMessageListFragment;
+
+    private Account mAccount;
+    private String mQueryString;
+    private String mFolderName;
+    private Flag[] mQueryFlags;
+    private Flag[] mForbiddenFlags;
+    private String mSearchAccount = null;
+    private String mSearchFolder = null;
+    private boolean mIntegrate;
+    private String[] mAccountUuids;
+    private String[] mFolderNames;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.message_list);
+
+        // need this for actionbar initialization
+        mQueryString = getIntent().getStringExtra(SearchManager.QUERY);
+
+        mActionBar = getSupportActionBar();
+        initializeActionBar();
+
+        // Enable gesture detection for MessageLists
+        setupGestureDetector(this);
+
+        decodeExtras(getIntent());
+
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        fragmentManager.addOnBackStackChangedListener(this);
+
+        mMessageListFragment = (MessageListFragment) fragmentManager.findFragmentById(R.id.message_list_container);
+
+        if (mMessageListFragment == null) {
+            FragmentTransaction ft = fragmentManager.beginTransaction();
+            if (mQueryString == null) {
+                mMessageListFragment = MessageListFragment.newInstance(mAccount, mFolderName);
+            } else if (mSearchAccount != null) {
+                mMessageListFragment = MessageListFragment.newInstance(mSearchAccount,
+                        mSearchFolder, mQueryString, false);
+            } else {
+                mMessageListFragment = MessageListFragment.newInstance(mTitle, mAccountUuids,
+                        mFolderNames, mQueryString, mQueryFlags, mForbiddenFlags, mIntegrate);
+            }
+            ft.add(R.id.message_list_container, mMessageListFragment);
+            ft.commit();
+        }
+    }
+
+    private void decodeExtras(Intent intent) {
+        mQueryString = intent.getStringExtra(SearchManager.QUERY);
+        mFolderName = null;
+        mSearchAccount = null;
+        mSearchFolder = null;
+        if (mQueryString != null) {
+            if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+                //Query was received from Search Dialog
+                Bundle appData = getIntent().getBundleExtra(SearchManager.APP_DATA);
+                if (appData != null) {
+                    mSearchAccount = appData.getString(EXTRA_SEARCH_ACCOUNT);
+                    mSearchFolder = appData.getString(EXTRA_SEARCH_FOLDER);
+                }
+            } else {
+                mSearchAccount = intent.getStringExtra(EXTRA_SEARCH_ACCOUNT);
+                mSearchFolder = intent.getStringExtra(EXTRA_SEARCH_FOLDER);
+            }
+        }
+
+        String accountUuid = intent.getStringExtra(EXTRA_ACCOUNT);
+        mFolderName = intent.getStringExtra(EXTRA_FOLDER);
+
+        mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
+
+        if (mAccount != null && !mAccount.isAvailable(this)) {
+            Log.i(K9.LOG_TAG, "not opening MessageList of unavailable account");
+            onAccountUnavailable();
+            return;
+        }
+
+        String queryFlags = intent.getStringExtra(EXTRA_QUERY_FLAGS);
+        if (queryFlags != null) {
+            String[] flagStrings = queryFlags.split(",");
+            mQueryFlags = new Flag[flagStrings.length];
+            for (int i = 0; i < flagStrings.length; i++) {
+                mQueryFlags[i] = Flag.valueOf(flagStrings[i]);
+            }
+        }
+        String forbiddenFlags = intent.getStringExtra(EXTRA_FORBIDDEN_FLAGS);
+        if (forbiddenFlags != null) {
+            String[] flagStrings = forbiddenFlags.split(",");
+            mForbiddenFlags = new Flag[flagStrings.length];
+            for (int i = 0; i < flagStrings.length; i++) {
+                mForbiddenFlags[i] = Flag.valueOf(flagStrings[i]);
+            }
+        }
+        mIntegrate = intent.getBooleanExtra(EXTRA_INTEGRATE, false);
+        mAccountUuids = intent.getStringArrayExtra(EXTRA_ACCOUNT_UUIDS);
+        mFolderNames = intent.getStringArrayExtra(EXTRA_FOLDER_NAMES);
+        mTitle = intent.getStringExtra(EXTRA_TITLE);
+
+        // Take the initial folder into account only if we are *not* restoring
+        // the activity already.
+        if (mFolderName == null && mQueryString == null) {
+            mFolderName = mAccount.getAutoExpandFolderName();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        StorageManager.getInstance(getApplication()).removeListener(mStorageListener);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (!(this instanceof Search)) {
+            //necessary b/c no guarantee Search.onStop will be called before MessageList.onResume
+            //when returning from search results
+            Search.setActive(false);
+        }
+
+        if (mAccount != null && !mAccount.isAvailable(this)) {
+            onAccountUnavailable();
+            return;
+        }
+        StorageManager.getInstance(getApplication()).addListener(mStorageListener);
+    }
+
+    private void initializeActionBar() {
+        mActionBar.setDisplayShowCustomEnabled(true);
+        mActionBar.setCustomView(R.layout.actionbar_custom);
+
+        View customView = mActionBar.getCustomView();
+        mActionBarTitle = (TextView) customView.findViewById(R.id.actionbar_title_first);
+        mActionBarSubTitle = (TextView) customView.findViewById(R.id.actionbar_title_sub);
+        mActionBarUnread = (TextView) customView.findViewById(R.id.actionbar_unread_count);
+
+        if (mQueryString != null) {
+            mActionBarSubTitle.setVisibility(View.GONE);
+        }
+
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        // Shortcuts that work no matter what is selected
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_UP: {
+                if (K9.useVolumeKeysForListNavigationEnabled()) {
+                    mMessageListFragment.onMoveUp();
+                    return true;
+                }
+                return false;
+            }
+            case KeyEvent.KEYCODE_VOLUME_DOWN: {
+                if (K9.useVolumeKeysForListNavigationEnabled()) {
+                    mMessageListFragment.onMoveDown();
+                    return true;
+                }
+                return false;
+            }
+            case KeyEvent.KEYCODE_C: {
+                mMessageListFragment.onCompose();
+                return true;
+            }
+            case KeyEvent.KEYCODE_Q: {
+                onShowFolderList();
+                return true;
+            }
+            case KeyEvent.KEYCODE_O: {
+                mMessageListFragment.onCycleSort();
+                return true;
+            }
+            case KeyEvent.KEYCODE_I: {
+                mMessageListFragment.onReverseSort();
+                return true;
+            }
+            case KeyEvent.KEYCODE_H: {
+                Toast toast = Toast.makeText(this, R.string.message_list_help_key, Toast.LENGTH_LONG);
+                toast.show();
+                return true;
+            }
+        }
+
+        boolean retval = true;
+        try {
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_DEL:
+                case KeyEvent.KEYCODE_D: {
+                    mMessageListFragment.onDelete();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_S: {
+                    mMessageListFragment.toggleMessageSelect();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_G: {
+                    mMessageListFragment.onToggleFlag();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_M: {
+                    mMessageListFragment.onMove();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_V: {
+                    mMessageListFragment.onArchive();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_Y: {
+                    mMessageListFragment.onCopy();
+                    return true;
+                }
+                case KeyEvent.KEYCODE_Z: {
+                    mMessageListFragment.onToggleRead();
+                    return true;
+                }
+            }
+        } finally {
+            retval = super.onKeyDown(keyCode, event);
+        }
+        return retval;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        // Swallow these events too to avoid the audible notification of a volume change
+        if (K9.useVolumeKeysForListNavigationEnabled()) {
+            if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
+                if (K9.DEBUG)
+                    Log.v(K9.LOG_TAG, "Swallowed key up.");
+                return true;
+            }
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
+    private void onAccounts() {
+        Accounts.listAccounts(this);
+        finish();
+    }
+
+    private void onShowFolderList() {
+        FolderList.actionHandleAccount(this, mAccount);
+        finish();
+    }
+
+    private void onEditPrefs() {
+        Prefs.actionPrefs(this);
+    }
+
+    private void onEditAccount() {
+        AccountSettings.actionSettings(this, mAccount);
+    }
+
+    @Override
+    public boolean onSearchRequested() {
+        return mMessageListFragment.onSearchRequested();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int itemId = item.getItemId();
+        switch (itemId) {
+            case android.R.id.home: {
+                FragmentManager fragmentManager = getSupportFragmentManager();
+                if (fragmentManager.getBackStackEntryCount() > 0) {
+                    fragmentManager.popBackStack();
+                } else if (mIntegrate) {
+                    // If we were in one of the integrated mailboxes (think All Mail or Integrated Inbox), then
+                    // go to accounts.
+                    onAccounts();
+                } else if (mQueryString != null) {
+                    // We did a search of some sort.  Go back to wherever the user searched from.
+                    onBackPressed();
+                } else {
+                    // In a standard message list of a folder.  Go to folder list.
+                    onShowFolderList();
+                }
+                return true;
+            }
+            case R.id.compose: {
+                mMessageListFragment.onCompose();
+                return true;
+            }
+            case R.id.check_mail: {
+                mMessageListFragment.checkMail();
+                return true;
+            }
+            case R.id.set_sort_date: {
+                mMessageListFragment.changeSort(SortType.SORT_DATE);
+                return true;
+            }
+            case R.id.set_sort_arrival: {
+                mMessageListFragment.changeSort(SortType.SORT_ARRIVAL);
+                return true;
+            }
+            case R.id.set_sort_subject: {
+                mMessageListFragment.changeSort(SortType.SORT_SUBJECT);
+                return true;
+            }
+            case R.id.set_sort_sender: {
+                mMessageListFragment.changeSort(SortType.SORT_SENDER);
+                return true;
+            }
+            case R.id.set_sort_flag: {
+                mMessageListFragment.changeSort(SortType.SORT_FLAGGED);
+                return true;
+            }
+            case R.id.set_sort_unread: {
+                mMessageListFragment.changeSort(SortType.SORT_UNREAD);
+                return true;
+            }
+            case R.id.set_sort_attach: {
+                mMessageListFragment.changeSort(SortType.SORT_ATTACHMENT);
+                return true;
+            }
+            case R.id.select_all: {
+                mMessageListFragment.selectAll();
+                return true;
+            }
+            case R.id.app_settings: {
+                onEditPrefs();
+                return true;
+            }
+            case R.id.search_remote: {
+                mMessageListFragment.onRemoteSearch();
+                return true;
+            }
+        }
+
+        if (mQueryString != null) {
+            // None of the options after this point are "safe" for search results
+            //TODO: This is not true for "unread" and "starred" searches in regular folders
+            return false;
+        }
+
+        switch (itemId) {
+            case R.id.send_messages: {
+                mMessageListFragment.onSendPendingMessages();
+                return true;
+            }
+            case R.id.folder_settings: {
+                if (mFolderName != null) {
+                    FolderSettings.actionSettings(this, mAccount, mFolderName);
+                }
+                return true;
+            }
+            case R.id.account_settings: {
+                onEditAccount();
+                return true;
+            }
+            case R.id.expunge: {
+                mMessageListFragment.onExpunge();
+                return true;
+            }
+            default: {
+                return super.onOptionsItemSelected(item);
+            }
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getSupportMenuInflater().inflate(R.menu.message_list_option, menu);
+        mMenu = menu;
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        configureMenu(menu);
+        return true;
+    }
+
+    private void configureMenu(Menu menu) {
+        if (menu == null) {
+            return;
+        }
+
+        menu.findItem(R.id.search_remote).setVisible(false);
+
+        if (mMessageListFragment == null) {
+            // Hide everything (except "compose") if no MessageListFragment instance is available
+            menu.findItem(R.id.check_mail).setVisible(false);
+            menu.findItem(R.id.set_sort).setVisible(false);
+            menu.findItem(R.id.select_all).setVisible(false);
+            menu.findItem(R.id.send_messages).setVisible(false);
+            menu.findItem(R.id.expunge).setVisible(false);
+            menu.findItem(R.id.settings).setVisible(false);
+        } else {
+            menu.findItem(R.id.set_sort).setVisible(true);
+            menu.findItem(R.id.select_all).setVisible(true);
+            menu.findItem(R.id.settings).setVisible(true);
+
+            if (mMessageListFragment.isSearchQuery()) {
+                menu.findItem(R.id.expunge).setVisible(false);
+                menu.findItem(R.id.check_mail).setVisible(false);
+                menu.findItem(R.id.send_messages).setVisible(false);
+                menu.findItem(R.id.folder_settings).setVisible(false);
+                menu.findItem(R.id.account_settings).setVisible(false);
+
+                // If this is an explicit local search, show the option to search the cloud.
+                if (!mMessageListFragment.isRemoteSearch() &&
+                        mMessageListFragment.isRemoteSearchAllowed()) {
+                    menu.findItem(R.id.search_remote).setVisible(true);
+                }
+
+            } else {
+                menu.findItem(R.id.folder_settings).setVisible(true);
+                menu.findItem(R.id.account_settings).setVisible(true);
+
+                if (mMessageListFragment.isOutbox()) {
+                    menu.findItem(R.id.send_messages).setVisible(true);
+                } else {
+                    menu.findItem(R.id.send_messages).setVisible(false);
+                }
+
+                if (mMessageListFragment.isRemoteFolder()) {
+                    menu.findItem(R.id.check_mail).setVisible(true);
+                    menu.findItem(R.id.expunge).setVisible(mMessageListFragment.isAccountExpungeCapable());
+                } else {
+                    menu.findItem(R.id.check_mail).setVisible(false);
+                    menu.findItem(R.id.expunge).setVisible(false);
+                }
+            }
+        }
+    }
+
+    protected void onAccountUnavailable() {
+        finish();
+        // TODO inform user about account unavailability using Toast
+        Accounts.listAccounts(this);
+    }
+
+    public void setActionBarTitle(String title) {
+        mActionBarTitle.setText(title);
+    }
+
+    public void setActionBarSubTitle(String subTitle) {
+        mActionBarSubTitle.setText(subTitle);
+    }
+
+    public void setActionBarUnread(int unread) {
+        if (unread == 0) {
+            mActionBarUnread.setVisibility(View.GONE);
+        } else {
+            mActionBarUnread.setVisibility(View.VISIBLE);
+            mActionBarUnread.setText(Integer.toString(unread));
+        }
+    }
+
+    @Override
+    public void setMessageListTitle(String title) {
+        setActionBarTitle(title);
+    }
+
+    @Override
+    public void setMessageListSubTitle(String subTitle) {
+        setActionBarSubTitle(subTitle);
+    }
+
+    @Override
+    public void setUnreadCount(int unread) {
+        setActionBarUnread(unread);
+    }
+
+    @Override
+    public void setMessageListProgress(int progress) {
+        setSupportProgress(progress);
+    }
+
+    @Override
+    public void openMessage(MessageReference messageReference) {
+        Preferences prefs = Preferences.getPreferences(getApplicationContext());
+        Account account = prefs.getAccount(messageReference.accountUuid);
+        String folderName = messageReference.folderName;
+
+        if (folderName.equals(account.getDraftsFolderName())) {
+            MessageCompose.actionEditDraft(this, messageReference);
+        } else {
+            ArrayList<MessageReference> messageRefs = mMessageListFragment.getMessageReferences();
+
+            Log.i(K9.LOG_TAG, "MessageList sending message " + messageReference);
+
+            MessageView.actionView(this, messageReference, messageRefs, getIntent().getExtras());
+        }
+
+        /*
+         * We set read=true here for UI performance reasons. The actual value
+         * will get picked up on the refresh when the Activity is resumed but
+         * that may take a second or so and we don't want this to show and
+         * then go away. I've gone back and forth on this, and this gives a
+         * better UI experience, so I am putting it back in.
+         */
+//        if (!message.read) {
+//            message.read = true;
+//        }
+    }
+
+    @Override
+    public void onResendMessage(Message message) {
+        MessageCompose.actionEditDraft(this, message.makeMessageReference());
+    }
+
+    @Override
+    public void onForward(Message message) {
+        MessageCompose.actionForward(this, message.getFolder().getAccount(), message, null);
+    }
+
+    @Override
+    public void onReply(Message message) {
+        MessageCompose.actionReply(this, message.getFolder().getAccount(), message, false, null);
+    }
+
+    @Override
+    public void onReplyAll(Message message) {
+        MessageCompose.actionReply(this, message.getFolder().getAccount(), message, true, null);
+    }
+
+    @Override
+    public void onCompose(Account account) {
+        MessageCompose.actionCompose(this, account);
+    }
+
+    @Override
+    public void showMoreFromSameSender(String senderAddress) {
+        MessageListFragment fragment = MessageListFragment.newInstance("From " + senderAddress,
+                null, null, senderAddress, null, null, false);
+
+        addMessageListFragment(fragment);
+    }
+
+    @Override
+    public void onBackStackChanged() {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        mMessageListFragment = (MessageListFragment) fragmentManager.findFragmentById(
+                R.id.message_list_container);
+
+        configureMenu(mMenu);
+    }
+
+    @Override
+    public void onSwipeRightToLeft(MotionEvent e1, MotionEvent e2) {
+        if (mMessageListFragment != null) {
+            mMessageListFragment.onSwipeRightToLeft(e1, e2);
+        }
+    }
+
+    @Override
+    public void onSwipeLeftToRight(MotionEvent e1, MotionEvent e2) {
+        if (mMessageListFragment != null) {
+            mMessageListFragment.onSwipeLeftToRight(e1, e2);
+        }
+    }
+
+    private final class StorageListenerImplementation implements StorageManager.StorageListener {
+        @Override
+        public void onUnmount(String providerId) {
+            if (mAccount != null && providerId.equals(mAccount.getLocalStorageProviderId())) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        onAccountUnavailable();
+                    }
+                });
+            }
+        }
+
+        @Override
+        public void onMount(String providerId) {
+            // no-op
+        }
+    }
+
+    @Override
+    public void remoteSearch(String searchAccount, String searchFolder, String queryString) {
+        MessageListFragment fragment = MessageListFragment.newInstance(searchAccount, searchFolder,
+                queryString, true);
+
+        addMessageListFragment(fragment);
+    }
+
+    private void addMessageListFragment(MessageListFragment fragment) {
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+
+        ft.replace(R.id.message_list_container, fragment);
+        ft.addToBackStack(null);
+
+        mMessageListFragment = fragment;
+        ft.commit();
+    }
+
+    @Override
+    public boolean startSearch(Account account, String folderName) {
+        // If this search was started from a MessageList of a single folder, pass along that folder info
+        // so that we can enable remote search.
+        if (account != null && folderName != null) {
+            final Bundle appData = new Bundle();
+            appData.putString(EXTRA_SEARCH_ACCOUNT, account.getUuid());
+            appData.putString(EXTRA_SEARCH_FOLDER, folderName);
+            startSearch(null, false, appData, false);
+        } else {
+            // TODO Handle the case where we're searching from within a search result.
+            startSearch(null, false, null, false);
+        }
+
+        return true;
+    }
+}
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 458d17580..df8d85b33 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1,5 +1,6 @@
 package com.fsck.k9.fragment;
 
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -9,18 +10,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
+import android.app.Activity;
 import android.app.SearchManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences.Editor;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.app.DialogFragment;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.AbsoluteSizeSpan;
@@ -28,9 +30,8 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.*;
+import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -46,7 +47,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragment;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -59,34 +60,77 @@ import com.fsck.k9.FontSizes;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
-import com.fsck.k9.SearchSpecification;
-import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener;
-import com.fsck.k9.activity.setup.AccountSettings;
-import com.fsck.k9.activity.setup.FolderSettings;
-import com.fsck.k9.activity.setup.Prefs;
+import com.fsck.k9.activity.ActivityListener;
+import com.fsck.k9.activity.ChooseFolder;
+import com.fsck.k9.activity.FolderInfoHolder;
+import com.fsck.k9.activity.MessageInfoHolder;
+import com.fsck.k9.activity.MessageReference;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
+import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 import com.fsck.k9.helper.MessageHelper;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.Store;
-import com.fsck.k9.mail.store.ImapStore;
 import com.fsck.k9.mail.store.LocalStore;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
-import com.fsck.k9.mail.store.StorageManager;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 
 
-/**
- * MessageList is the primary user interface for the program. This Activity
- * shows a list of messages.
- * From this Activity the user can perform all standard message operations.
- */
-public class MessageListFragment extends K9ListActivity implements OnItemClickListener,
-        OnSwipeGestureListener {
+public class MessageListFragment extends SherlockFragment implements OnItemClickListener,
+        ConfirmationDialogFragmentListener {
+
+    public static MessageListFragment newInstance(Account account, String folderName) {
+        MessageListFragment fragment = new MessageListFragment();
+
+        Bundle args = new Bundle();
+        args.putString(ARG_ACCOUNT, account.getUuid());
+        args.putString(ARG_FOLDER, folderName);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
+    public static MessageListFragment newInstance(String title, String[] accountUuids,
+            String[] folderNames, String queryString, Flag[] flags,
+            Flag[] forbiddenFlags, boolean integrate) {
+
+        MessageListFragment fragment = new MessageListFragment();
+
+        Bundle args = new Bundle();
+        args.putStringArray(ARG_ACCOUNT_UUIDS, accountUuids);
+        args.putStringArray(ARG_FOLDER_NAMES, folderNames);
+        args.putString(ARG_QUERY, queryString);
+        if (flags != null) {
+            args.putString(ARG_QUERY_FLAGS, Utility.combine(flags, ','));
+        }
+        if (forbiddenFlags != null) {
+            args.putString(ARG_FORBIDDEN_FLAGS, Utility.combine(forbiddenFlags, ','));
+        }
+        args.putBoolean(ARG_INTEGRATE, integrate);
+        args.putString(ARG_TITLE, title);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
+    public static MessageListFragment newInstance(String searchAccount, String searchFolder,
+            String queryString, boolean remoteSearch) {
+        MessageListFragment fragment = new MessageListFragment();
+
+        Bundle args = new Bundle();
+        args.putString(ARG_SEARCH_ACCOUNT, searchAccount);
+        args.putString(ARG_SEARCH_FOLDER, searchFolder);
+        args.putString(ARG_QUERY, queryString);
+        args.putBoolean(ARG_REMOTE_SEARCH, remoteSearch);
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+
 
     /**
      * Reverses the result of a {@link Comparator}.
@@ -234,18 +278,20 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
 
-    private static final String EXTRA_ACCOUNT = "account";
-    private static final String EXTRA_FOLDER  = "folder";
-    private static final String EXTRA_REMOTE_SEARCH = "com.fsck.k9.remote_search";
-    private static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
-    private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.search_folder";
-    private static final String EXTRA_QUERY_FLAGS = "queryFlags";
-    private static final String EXTRA_FORBIDDEN_FLAGS = "forbiddenFlags";
-    private static final String EXTRA_INTEGRATE = "integrate";
-    private static final String EXTRA_ACCOUNT_UUIDS = "accountUuids";
-    private static final String EXTRA_FOLDER_NAMES = "folderNames";
-    private static final String EXTRA_TITLE = "title";
-    private static final String EXTRA_LIST_POSITION = "listPosition";
+    private static final String ARG_ACCOUNT = "account";
+    private static final String ARG_FOLDER  = "folder";
+    private static final String ARG_REMOTE_SEARCH = "remote_search";
+    private static final String ARG_QUERY = "query";
+    private static final String ARG_SEARCH_ACCOUNT = "search_account";
+    private static final String ARG_SEARCH_FOLDER = "search_folder";
+    private static final String ARG_QUERY_FLAGS = "queryFlags";
+    private static final String ARG_FORBIDDEN_FLAGS = "forbiddenFlags";
+    private static final String ARG_INTEGRATE = "integrate";
+    private static final String ARG_ACCOUNT_UUIDS = "accountUuids";
+    private static final String ARG_FOLDER_NAMES = "folderNames";
+    private static final String ARG_TITLE = "title";
+
+    private static final String STATE_LIST_POSITION = "listPosition";
 
     /**
      * Maps a {@link SortType} to a {@link Comparator} implementation.
@@ -319,7 +365,6 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     private FontSizes mFontSizes = K9.getFontSizes();
 
     private MenuItem mRefreshMenuItem;
-    private ActionBar mActionBar;
     private ActionMode mActionMode;
     private View mActionBarProgressView;
     private Bundle mState = null;
@@ -333,37 +378,17 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
      */
     private List<MessageInfoHolder> mActiveMessages;
 
-    private Context context;
-
     /* package visibility for faster inner class access */
-    MessageHelper mMessageHelper = MessageHelper.getInstance(this);
-
-    private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation();
-
-    private TextView mActionBarTitle;
-    private TextView mActionBarSubTitle;
-    private TextView mActionBarUnread;
+    MessageHelper mMessageHelper;
 
     private ActionModeCallback mActionModeCallback = new ActionModeCallback();
 
-    private final class StorageListenerImplementation implements StorageManager.StorageListener {
-        @Override
-        public void onUnmount(String providerId) {
-            if (mAccount != null && providerId.equals(mAccount.getLocalStorageProviderId())) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        onAccountUnavailable();
-                    }
-                });
-            }
-        }
 
-        @Override
-        public void onMount(String providerId) {
-            // no-op
-        }
-    }
+    private MessageListFragmentListener mFragmentListener;
+
+
+    private DateFormat mTimeFormat;
+
 
     /**
      * This class is used to run operations that modify UI elements in the UI thread.
@@ -382,6 +407,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         private static final int ACTION_REFRESH_TITLE = 5;
         private static final int ACTION_PROGRESS = 6;
 
+
         public void removeMessage(MessageReference messageReference) {
             android.os.Message msg = android.os.Message.obtain(this, ACTION_REMOVE_MESSAGE,
                     messageReference);
@@ -411,10 +437,11 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
 
         public void updateFooter(final String message, final boolean showProgress) {
-            runOnUiThread(new Runnable() {
+            //TODO: use message
+            post(new Runnable() {
                 @Override
                 public void run() {
-                    MessageList.this.updateFooter(message, showProgress);
+                    updateFooter(message, showProgress);
                 }
             });
         }
@@ -463,16 +490,16 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 case ACTION_FOLDER_LOADING: {
                     String folder = (String) msg.obj;
                     boolean loading = (msg.arg1 == 1);
-                    MessageList.this.folderLoading(folder, loading);
+                    MessageListFragment.this.folderLoading(folder, loading);
                     break;
                 }
                 case ACTION_REFRESH_TITLE: {
-                    MessageList.this.refreshTitle();
+                    MessageListFragment.this.refreshTitle();
                     break;
                 }
                 case ACTION_PROGRESS: {
                     boolean progress = (msg.arg1 == 1);
-                    MessageList.this.progress(progress);
+                    MessageListFragment.this.progress(progress);
                     break;
                 }
             }
@@ -508,7 +535,10 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             }
         }
 
-        return new ComparatorChain<MessageInfoHolder>(chain);
+        // build the comparator chain
+        final Comparator<MessageInfoHolder> chainComparator = new ComparatorChain<MessageInfoHolder>(chain);
+
+        return chainComparator;
     }
 
     private void folderLoading(String folder, boolean loading) {
@@ -538,49 +568,59 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             }
         }
 
-        setSupportProgress(level);
+        mFragmentListener.setMessageListProgress(level);
     }
 
     private void setWindowTitle() {
         // regular folder content display
         if (mFolderName != null) {
-            String displayName = FolderInfoHolder.getDisplayName(MessageList.this, mAccount,
+            Activity activity = getActivity();
+            String displayName = FolderInfoHolder.getDisplayName(activity, mAccount,
                 mFolderName);
 
-            mActionBarTitle.setText(displayName);
+            mFragmentListener.setMessageListTitle(displayName);
 
-            String operation = mAdapter.mListener.getOperation(MessageList.this, getTimeFormat()).trim();
+            String operation = mAdapter.mListener.getOperation(activity, getTimeFormat()).trim();
             if (operation.length() < 1) {
-                mActionBarSubTitle.setText(mAccount.getEmail());
+                mFragmentListener.setMessageListSubTitle(mAccount.getEmail());
             } else {
-                mActionBarSubTitle.setText(operation);
+                mFragmentListener.setMessageListSubTitle(operation);
             }
         } else if (mQueryString != null) {
             // query result display.  This may be for a search folder as opposed to a user-initiated search.
             if (mTitle != null) {
                 // This was a search folder; the search folder has overridden our title.
-                mActionBarTitle.setText(mTitle);
+                mFragmentListener.setMessageListTitle(mTitle);
             } else {
                 // This is a search result; set it to the default search result line.
-                mActionBarTitle.setText(getString(R.string.search_results));
+                mFragmentListener.setMessageListTitle(getString(R.string.search_results));
             }
+
+            mFragmentListener.setMessageListSubTitle(null);
         }
 
         // set unread count
         if (mUnreadMessageCount == 0) {
-            mActionBarUnread.setVisibility(View.GONE);
+            mFragmentListener.setUnreadCount(0);
         } else {
             if (mQueryString != null && mTitle == null) {
                 // This is a search result.  The unread message count is easily confused
                 // with total number of messages in the search result, so let's hide it.
-                mActionBarUnread.setVisibility(View.GONE);
+                mFragmentListener.setUnreadCount(0);
             } else {
-                mActionBarUnread.setText(Integer.toString(mUnreadMessageCount));
-                mActionBarUnread.setVisibility(View.VISIBLE);
+                mFragmentListener.setUnreadCount(mUnreadMessageCount);
             }
         }
     }
 
+    private void setupFormats() {
+        mTimeFormat = android.text.format.DateFormat.getTimeFormat(getActivity());
+    }
+
+    private DateFormat getTimeFormat() {
+        return mTimeFormat;
+    }
+
     private void progress(final boolean progress) {
         // Make sure we don't try this before the menu is initialized
         // this could happen while the activity is initialized.
@@ -597,74 +637,6 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
     }
 
-    public static void actionHandleFolder(Context context, Account account, String folder) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra(EXTRA_ACCOUNT, account.getUuid());
-
-        if (folder != null) {
-            intent.putExtra(EXTRA_FOLDER, folder);
-        }
-        context.startActivity(intent);
-    }
-
-    public static Intent actionHandleFolderIntent(Context context, Account account, String folder) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra(EXTRA_ACCOUNT, account.getUuid());
-
-        if (folder != null) {
-            intent.putExtra(EXTRA_FOLDER, folder);
-        }
-        return intent;
-    }
-
-    public static void actionHandle(Context context, String title, String queryString, boolean integrate, Flag[] flags, Flag[] forbiddenFlags) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra(SearchManager.QUERY, queryString);
-        if (flags != null) {
-            intent.putExtra(EXTRA_QUERY_FLAGS, Utility.combine(flags, ','));
-        }
-        if (forbiddenFlags != null) {
-            intent.putExtra(EXTRA_FORBIDDEN_FLAGS, Utility.combine(forbiddenFlags, ','));
-        }
-        intent.putExtra(EXTRA_INTEGRATE, integrate);
-        intent.putExtra(EXTRA_TITLE, title);
-        context.startActivity(intent);
-    }
-
-    /**
-     * Creates and returns an intent that opens Unified Inbox or All Messages screen.
-     */
-    public static Intent actionHandleAccountIntent(Context context, String title,
-            SearchSpecification searchSpecification) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.putExtra(SearchManager.QUERY, searchSpecification.getQuery());
-        if (searchSpecification.getRequiredFlags() != null) {
-            intent.putExtra(EXTRA_QUERY_FLAGS, Utility.combine(searchSpecification.getRequiredFlags(), ','));
-        }
-        if (searchSpecification.getForbiddenFlags() != null) {
-            intent.putExtra(EXTRA_FORBIDDEN_FLAGS, Utility.combine(searchSpecification.getForbiddenFlags(), ','));
-        }
-        intent.putExtra(EXTRA_INTEGRATE, searchSpecification.isIntegrate());
-        intent.putExtra(EXTRA_ACCOUNT_UUIDS, searchSpecification.getAccountUuids());
-        intent.putExtra(EXTRA_FOLDER_NAMES, searchSpecification.getFolderNames());
-        intent.putExtra(EXTRA_TITLE, title);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-        return intent;
-    }
-
-    public static void actionHandle(Context context, String title,
-                                    SearchSpecification searchSpecification) {
-        Intent intent = actionHandleAccountIntent(context, title, searchSpecification);
-        context.startActivity(intent);
-    }
-
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         if (view == mFooterView) {
@@ -672,7 +644,8 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 mController.loadMoreMessages(mAccount, mFolderName, mAdapter.mListener);
             } else if (mRemoteSearch && mAdapter.mExtraSearchResults != null && mAdapter.mExtraSearchResults.size() > 0 && mSearchAccount != null) {
                 int numResults = mAdapter.mExtraSearchResults.size();
-                Account account = Preferences.getPreferences(this).getAccount(mSearchAccount);
+                Context appContext = getActivity().getApplicationContext();
+                Account account = Preferences.getPreferences(appContext).getAccount(mSearchAccount);
                 if (account == null) {
                     mHandler.updateFooter("", false);
                     return;
@@ -700,82 +673,70 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        context = this;
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.message_list);
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
 
-        mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
-
-        // need this for actionbar initialization
-        mQueryString = getIntent().getStringExtra(SearchManager.QUERY);
-
-        mPullToRefreshView = (PullToRefreshListView) findViewById(R.id.message_list);
-
-        mInflater = getLayoutInflater();
-        mActionBar = getSupportActionBar();
-        initializeActionBar();
-        initializeLayout();
-
-        mPreviewLines = K9.messageListPreviewLines();
-
-        initializeMessageList(getIntent(), true);
-        mListView.setVerticalFadingEdgeEnabled(false);
-
-        // Enable gesture detection for MessageLists
-        setupGestureDetector(this);
-
-        // Correcting for screen rotation when in ActionMode
-        mSelectedCount = getSelectionFromCheckboxes().size();
-        if (mSelectedCount > 0) {
-            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
-            updateActionModeTitle();
+        try {
+            mFragmentListener = (MessageListFragmentListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.getClass() +
+                    " must implement MessageListFragmentListener");
         }
     }
 
     @Override
-    public void onNewIntent(Intent intent) {
-        setIntent(intent); // onNewIntent doesn't autoset our "internal" intent
-        initializeMessageList(intent, false);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mController = MessagingController.getInstance(getActivity().getApplication());
+
+        mPreviewLines = K9.messageListPreviewLines();
+
+        decodeArguments();
     }
 
-    private void initializeMessageList(Intent intent, boolean create) {
-        mQueryString = intent.getStringExtra(SearchManager.QUERY);
-        mFolderName = null;
-        mRemoteSearch = false;
-        mSearchAccount = null;
-        mSearchFolder = null;
-        if (mQueryString != null) {
-            if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-                //Query was received from Search Dialog
-                Bundle appData = getIntent().getBundleExtra(SearchManager.APP_DATA);
-                if (appData != null) {
-                    mSearchAccount = appData.getString(EXTRA_SEARCH_ACCOUNT);
-                    mSearchFolder = appData.getString(EXTRA_SEARCH_FOLDER);
-                    mRemoteSearch = appData.getBoolean(EXTRA_REMOTE_SEARCH);
-                }
-            } else {
-                mSearchAccount = intent.getStringExtra(EXTRA_SEARCH_ACCOUNT);
-                mSearchFolder = intent.getStringExtra(EXTRA_SEARCH_FOLDER);
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
 
-            }
-        }
+        mInflater = inflater;
 
-        String accountUuid = intent.getStringExtra(EXTRA_ACCOUNT);
-        mFolderName = intent.getStringExtra(EXTRA_FOLDER);
+        View view = inflater.inflate(R.layout.message_list_fragment, container, false);
 
-        mAccount = Preferences.getPreferences(this).getAccount(accountUuid);
+        mActionBarProgressView = inflater.inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
 
-        if (mAccount != null && !mAccount.isAvailable(this)) {
-            Log.i(K9.LOG_TAG, "not opening MessageList of unavailable account");
-            onAccountUnavailable();
-            return;
-        }
+        mPullToRefreshView = (PullToRefreshListView) view.findViewById(R.id.message_list);
 
+        initializeLayout();
+        mListView.setVerticalFadingEdgeEnabled(false);
 
+        return view;
+    }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
 
-        String queryFlags = intent.getStringExtra(EXTRA_QUERY_FLAGS);
+        mMessageHelper = MessageHelper.getInstance(getActivity());
+
+        initializeMessageList();
+    }
+
+    private void decodeArguments() {
+        Bundle args = getArguments();
+
+        mQueryString = args.getString(SearchManager.QUERY);
+        mFolderName = args.getString(ARG_FOLDER);
+        mRemoteSearch = args.getBoolean(ARG_REMOTE_SEARCH, false);
+        mSearchAccount = args.getString(ARG_SEARCH_ACCOUNT);
+        mSearchFolder = args.getString(ARG_SEARCH_FOLDER);
+
+        String accountUuid = args.getString(ARG_ACCOUNT);
+
+        Context appContext = getActivity().getApplicationContext();
+        mAccount = Preferences.getPreferences(appContext).getAccount(accountUuid);
+
+        String queryFlags = args.getString(ARG_QUERY_FLAGS);
         if (queryFlags != null) {
             String[] flagStrings = queryFlags.split(",");
             mQueryFlags = new Flag[flagStrings.length];
@@ -783,7 +744,8 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 mQueryFlags[i] = Flag.valueOf(flagStrings[i]);
             }
         }
-        String forbiddenFlags = intent.getStringExtra(EXTRA_FORBIDDEN_FLAGS);
+
+        String forbiddenFlags = args.getString(ARG_FORBIDDEN_FLAGS);
         if (forbiddenFlags != null) {
             String[] flagStrings = forbiddenFlags.split(",");
             mForbiddenFlags = new Flag[flagStrings.length];
@@ -791,52 +753,37 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 mForbiddenFlags[i] = Flag.valueOf(flagStrings[i]);
             }
         }
-        mIntegrate = intent.getBooleanExtra(EXTRA_INTEGRATE, false);
-        mAccountUuids = intent.getStringArrayExtra(EXTRA_ACCOUNT_UUIDS);
-        mFolderNames = intent.getStringArrayExtra(EXTRA_FOLDER_NAMES);
-        mTitle = intent.getStringExtra(EXTRA_TITLE);
 
-        // Take the initial folder into account only if we are *not* restoring
-        // the activity already.
-        if (mFolderName == null && mQueryString == null) {
-            mFolderName = mAccount.getAutoExpandFolderName();
-        }
+        mIntegrate = args.getBoolean(ARG_INTEGRATE, false);
+        mAccountUuids = args.getStringArray(ARG_ACCOUNT_UUIDS);
+        mFolderNames = args.getStringArray(ARG_FOLDER_NAMES);
+        mTitle = args.getString(ARG_TITLE);
+    }
 
+    private void initializeMessageList() {
         mAdapter = new MessageListAdapter();
-        restorePreviousData();
 
         if (mFolderName != null) {
             mCurrentFolder = mAdapter.getFolder(mFolderName, mAccount);
         }
 
-        // Hide "Load up to x more" footer for local search views
-        mFooterView.setVisibility((mQueryString != null && !mRemoteSearch) ? View.GONE : View.VISIBLE);
+        // Hide "Load up to x more" footer for search views
+        mFooterView.setVisibility((mQueryString != null) ? View.GONE : View.VISIBLE);
 
-        mController = MessagingController.getInstance(getApplication());
+        mController = MessagingController.getInstance(getActivity().getApplication());
         mListView.setAdapter(mAdapter);
     }
 
-    private void restorePreviousData() {
-        final ActivityState previousData = getLastNonConfigurationInstance();
-
-        if (previousData != null) {
-            mAdapter.restoreMessages(previousData.messages);
-            mActiveMessages = previousData.activeMessages;
-        }
-    }
-
     @Override
     public void onPause() {
         super.onPause();
         mController.removeListener(mAdapter.mListener);
         saveListState();
-
-        StorageManager.getInstance(getApplication()).removeListener(mStorageListener);
     }
 
     public void saveListState() {
         mState = new Bundle();
-        mState.putInt(EXTRA_LIST_POSITION, mListView.getSelectedItemPosition());
+        mState.putInt(STATE_LIST_POSITION, mListView.getSelectedItemPosition());
     }
 
     public void restoreListState() {
@@ -844,7 +791,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             return;
         }
 
-        int pos = mState.getInt(EXTRA_LIST_POSITION, ListView.INVALID_POSITION);
+        int pos = mState.getInt(STATE_LIST_POSITION, ListView.INVALID_POSITION);
 
         if (pos >= mListView.getCount()) {
             pos = mListView.getCount() - 1;
@@ -866,22 +813,13 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     public void onResume() {
         super.onResume();
 
-        if (mAccount != null && !mAccount.isAvailable(this)) {
-            onAccountUnavailable();
-            return;
-        }
+        setupFormats();
 
+        Context appContext = getActivity().getApplicationContext();
 
-        if (!(this instanceof Search)) {
-            //necessary b/c no guarantee Search.onStop will be called before MessageList.onResume
-            //when returning from search results
-            Search.setActive(false);
-        }
-
-        StorageManager.getInstance(getApplication()).addListener(mStorageListener);
         mSenderAboveSubject = K9.messageListSenderAboveSubject();
 
-        final Preferences prefs = Preferences.getPreferences(getApplicationContext());
+        final Preferences prefs = Preferences.getPreferences(appContext);
 
         boolean allowRemoteSearch = false;
         if (mSearchAccount != null) {
@@ -893,14 +831,22 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
 
         // Check if we have connectivity.  Cache the value.
         if (mHasConnectivity == null) {
-            mHasConnectivity = Utility.hasConnectivity(getApplication());
+            final ConnectivityManager connectivityManager =
+                (ConnectivityManager) getActivity().getApplication().getSystemService(
+                        Context.CONNECTIVITY_SERVICE);
+            final NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
+            if (netInfo != null && netInfo.getState() == NetworkInfo.State.CONNECTED) {
+                mHasConnectivity = true;
+            } else {
+                mHasConnectivity = false;
+            }
         }
 
         if (mQueryString == null) {
             mPullToRefreshView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
                 @Override
                 public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-                    checkMail(mAccount, mFolderName);
+                    checkMail();
                 }
             });
         } else if (allowRemoteSearch && !mRemoteSearch && !mIntegrate && mHasConnectivity) {
@@ -938,10 +884,9 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
 
         for (Account accountWithNotification : accountsWithNotification) {
-            mController.notifyAccountCancel(this, accountWithNotification);
+            mController.notifyAccountCancel(appContext, accountWithNotification);
         }
 
-
         if (mAdapter.isEmpty()) {
             if (mRemoteSearch) {
                 //TODO: Support flag based search
@@ -957,23 +902,24 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 // Don't show the archive button if this is a search.
 //                mBatchArchiveButton.setVisibility(View.GONE);
             }
+
         } else {
             // reread the selected date format preference in case it has changed
             mMessageHelper.refresh();
 
             mAdapter.markAllMessagesAsDirty();
 
-            new Thread() {
-                @Override
-                public void run() {
-                    if (!mRemoteSearch) {
+            if (!mRemoteSearch) {
+                new Thread() {
+                    @Override
+                    public void run() {
                         if (mFolderName != null) {
-                            mController.listLocalMessagesSynchronous(mAccount, mFolderName, mAdapter.mListener);
+                            mController.listLocalMessagesSynchronous(mAccount, mFolderName,  mAdapter.mListener);
                         } else if (mQueryString != null) {
                             mController.searchLocalMessagesSynchronous(mAccountUuids, mFolderNames, null, mQueryString, mIntegrate, mQueryFlags, mForbiddenFlags, mAdapter.mListener);
                         }
 
-                        runOnUiThread(new Runnable() {
+                        mHandler.post(new Runnable() {
                             @Override
                             public void run() {
                                 mAdapter.pruneDirtyMessages();
@@ -982,10 +928,10 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                             }
                         });
                     }
-                }
 
+                }
+                .start();
             }
-            .start();
         }
 
         if (mAccount != null && mFolderName != null && !mRemoteSearch) {
@@ -995,22 +941,6 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         refreshTitle();
     }
 
-    private void initializeActionBar() {
-        mActionBar.setDisplayShowCustomEnabled(true);
-        mActionBar.setCustomView(R.layout.actionbar_custom);
-
-        View customView = mActionBar.getCustomView();
-        mActionBarTitle = (TextView) customView.findViewById(R.id.actionbar_title_first);
-        mActionBarSubTitle = (TextView) customView.findViewById(R.id.actionbar_title_sub);
-        mActionBarUnread = (TextView) customView.findViewById(R.id.actionbar_unread_count);
-
-        if (mQueryString != null) {
-            mActionBarSubTitle.setVisibility(View.GONE);
-        }
-
-        mActionBar.setDisplayHomeAsUpEnabled(true);
-    }
-
     private void initializeLayout() {
         mListView = mPullToRefreshView.getRefreshableView();
         mListView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
@@ -1023,245 +953,41 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         registerForContextMenu(mListView);
     }
 
-
-    /**
-     * Container for values to be kept while the device configuration is
-     * modified at runtime (keyboard, orientation, etc.) and Android restarts
-     * this activity.
-     *
-     * @see MessageList#onRetainNonConfigurationInstance()
-     * @see MessageList#getLastNonConfigurationInstance()
-     */
-    static class ActivityState {
-        public List<MessageInfoHolder> messages;
-        public List<MessageInfoHolder> activeMessages;
-    }
-
-    /* (non-Javadoc)
-     *
-     * Method overridden for proper typing within this class (the return type is
-     * more specific than the super implementation)
-     *
-     * @see android.app.Activity#onRetainNonConfigurationInstance()
-     */
-    @Override
-    public ActivityState onRetainNonConfigurationInstance() {
-        final ActivityState state = new ActivityState();
-        state.messages = mAdapter.getMessages();
-        state.activeMessages = mActiveMessages;
-        return state;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * Method overridden for proper typing within this class (the return type is
-     * more specific than the super implementation)
-     *
-     * @see android.app.Activity#getLastNonConfigurationInstance()
-     */
-    @Override
-    public ActivityState getLastNonConfigurationInstance() {
-        return (ActivityState) super.getLastNonConfigurationInstance();
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Shortcuts that work no matter what is selected
-        switch (keyCode) {
-
-            // messagelist is actually a K9Activity, not a K9ListActivity
-            // This saddens me greatly, but to support volume key navigation
-            // in MessageView, we implement this bit of wrapper code
-        case KeyEvent.KEYCODE_VOLUME_UP: {
-            if (K9.useVolumeKeysForListNavigationEnabled()) {
-                int currentPosition = mListView.getSelectedItemPosition();
-                if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
-                    currentPosition = mListView.getFirstVisiblePosition();
-                }
-                if (currentPosition > 0) {
-                    mListView.setSelection(currentPosition - 1);
-                }
-                return true;
-            }
-            return false;
-        }
-        case KeyEvent.KEYCODE_VOLUME_DOWN: {
-            if (K9.useVolumeKeysForListNavigationEnabled()) {
-                int currentPosition = mListView.getSelectedItemPosition();
-                if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
-                    currentPosition = mListView.getFirstVisiblePosition();
-                }
-
-                if (currentPosition < mListView.getCount()) {
-                    mListView.setSelection(currentPosition + 1);
-                }
-                return true;
-            }
-            return false;
-        }
-        case KeyEvent.KEYCODE_C: {
-            onCompose();
-            return true;
-        }
-        case KeyEvent.KEYCODE_Q: {
-            onShowFolderList();
-            return true;
-        }
-        case KeyEvent.KEYCODE_O: {
-            onCycleSort();
-            return true;
-        }
-        case KeyEvent.KEYCODE_I: {
-            changeSort(mSortType);
-            return true;
-        }
-        case KeyEvent.KEYCODE_H: {
-            Toast toast = Toast.makeText(this, R.string.message_list_help_key, Toast.LENGTH_LONG);
-            toast.show();
-            return true;
-        }
-        }
-
-        //Shortcuts that only work when a message is selected
-        boolean retval = true;
-        int position = mListView.getSelectedItemPosition();
-        try {
-            if (position >= 0) {
-                MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
-
-                final List<MessageInfoHolder> selection = getSelectionFromMessage(message);
-
-                if (message != null) {
-                    switch (keyCode) {
-                    case KeyEvent.KEYCODE_DEL: {
-                        onDelete(selection);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_S: {
-                        toggleMessageSelect(message);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_D: {
-                        onDelete(selection);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_G: {
-                        setFlag(selection, Flag.FLAGGED, !message.flagged);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_M: {
-                        onMove(selection);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_V: {
-                        onArchive(selection);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_Y: {
-                        onCopy(selection);
-                        return true;
-                    }
-                    case KeyEvent.KEYCODE_Z: {
-                        setFlag(selection, Flag.SEEN, !message.read);
-                        return true;
-                    }
-                    }
-                }
-            }
-        } finally {
-            retval = super.onKeyDown(keyCode, event);
-        }
-        return retval;
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        // Swallow these events too to avoid the audible notification of a volume change
-        if (K9.useVolumeKeysForListNavigationEnabled()) {
-            if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) {
-                if (K9.DEBUG)
-                    Log.v(K9.LOG_TAG, "Swallowed key up.");
-                return true;
-            }
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
     private void onOpenMessage(MessageInfoHolder message) {
-        if (message.folder.name.equals(message.message.getFolder().getAccount().getDraftsFolderName())) {
-            MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
-        } else {
-            // Need to get the list before the sort starts
-            ArrayList<MessageReference> messageRefs = new ArrayList<MessageReference>();
-
-            for (MessageInfoHolder holder : mAdapter.getMessages()) {
-                MessageReference ref = holder.message.makeMessageReference();
-                messageRefs.add(ref);
-            }
-
-            MessageReference ref = message.message.makeMessageReference();
-            Log.i(K9.LOG_TAG, "MessageList sending message " + ref);
-
-            MessageView.actionView(this, ref, messageRefs, getIntent().getExtras());
-        }
-
-        /*
-         * We set read=true here for UI performance reasons. The actual value
-         * will get picked up on the refresh when the Activity is resumed but
-         * that may take a second or so and we don't want this to show and
-         * then go away. I've gone back and forth on this, and this gives a
-         * better UI experience, so I am putting it back in.
-         */
-        if (!message.read) {
-            message.read = true;
-        }
+        mFragmentListener.openMessage(message.message.makeMessageReference());
     }
 
-    private void onAccounts() {
-        Accounts.listAccounts(this);
-        finish();
-    }
-
-    private void onShowFolderList() {
-        FolderList.actionHandleAccount(this, mAccount);
-        finish();
-    }
-
-    private void onCompose() {
+    public void onCompose() {
         if (mQueryString != null) {
             /*
              * If we have a query string, we don't have an account to let
              * compose start the default action.
              */
-            MessageCompose.actionCompose(this, null);
+            mFragmentListener.onCompose(null);
         } else {
-            MessageCompose.actionCompose(this, mAccount);
+            mFragmentListener.onCompose(mAccount);
         }
     }
 
-    private void onReply(MessageInfoHolder holder) {
-        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, false, null);
+    public void onReply(MessageInfoHolder holder) {
+        mFragmentListener.onReply(holder.message);
     }
 
-    private void onReplyAll(MessageInfoHolder holder) {
-        MessageCompose.actionReply(this, holder.message.getFolder().getAccount(), holder.message, true, null);
+    public void onReplyAll(MessageInfoHolder holder) {
+        mFragmentListener.onReplyAll(holder.message);
     }
 
-    private void onForward(MessageInfoHolder holder) {
-        MessageCompose.actionForward(this, holder.message.getFolder().getAccount(), holder.message, null);
+    public void onForward(MessageInfoHolder holder) {
+        mFragmentListener.onForward(holder.message);
     }
 
-    private void onResendMessage(MessageInfoHolder message) {
-        MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
+    public void onResendMessage(MessageInfoHolder holder) {
+        mFragmentListener.onResendMessage(holder.message);
     }
 
-    private void onEditPrefs() {
-        Prefs.actionPrefs(this);
-    }
-
-    private void onEditAccount() {
-        AccountSettings.actionSettings(this, mAccount);
+    public void changeSort(SortType sortType) {
+        Boolean sortAscending = (mSortType == sortType) ? !mSortAscending : null;
+        changeSort(sortType, sortAscending);
     }
 
     /**
@@ -1270,44 +996,18 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
      *                        where we pull the account and folder info used for the next search.
      */
     public void onRemoteSearchRequested(final boolean fromLocalSearch) {
-        final Bundle appData = new Bundle();
+        String searchAccount;
+        String searchFolder;
+
         if (fromLocalSearch) {
-            appData.putString(EXTRA_SEARCH_ACCOUNT, mSearchAccount);
-            appData.putString(EXTRA_SEARCH_FOLDER, mSearchFolder);
+            searchAccount = mSearchAccount;
+            searchFolder = mSearchFolder;
         } else {
-            appData.putString(EXTRA_SEARCH_ACCOUNT, mAccount.getUuid());
-            appData.putString(EXTRA_SEARCH_FOLDER, mCurrentFolder.name);
+            searchAccount = mAccount.getUuid();
+            searchFolder = mCurrentFolder.name;
         }
-        appData.putBoolean(EXTRA_REMOTE_SEARCH, true);
 
-        final Intent intent = new Intent(Intent.ACTION_SEARCH);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(SearchManager.QUERY, mQueryString);
-        intent.putExtra(SearchManager.APP_DATA, appData);
-        intent.setComponent(new ComponentName(context.getApplicationContext(), MessageList.class));
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    public boolean onSearchRequested() {
-        // If this search was started from a MessageList of a single folder, pass along that folder info
-        // so that we can enable remote search.
-        if (mAccount != null && mCurrentFolder != null) {
-            final Bundle appData = new Bundle();
-            appData.putString(EXTRA_SEARCH_ACCOUNT, mAccount.getUuid());
-            appData.putString(EXTRA_SEARCH_FOLDER, mCurrentFolder.name);
-            startSearch(null, false, appData, false);
-        } else {
-            // TODO Handle the case where we're searching from within a search result.
-            startSearch(null, false, null, false);
-        }
-        return true;
-    }
-
-    private void changeSort(SortType sortType) {
-        Boolean sortAscending = (mSortType == sortType) ? !mSortAscending : null;
-        changeSort(sortType, sortAscending);
+        mFragmentListener.remoteSearch(searchAccount, searchFolder, mQueryString);
     }
 
     /**
@@ -1323,7 +1023,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     private void changeSort(SortType sortType, Boolean sortAscending) {
         mSortType = sortType;
 
-        Preferences prefs = Preferences.getPreferences(getApplicationContext());
+        Preferences prefs = Preferences.getPreferences(getActivity().getApplicationContext());
         Account account = getCurrentAccount(prefs);
 
         if (account != null) {
@@ -1360,13 +1060,13 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     private void reSort() {
         int toastString = mSortType.getToast(mSortAscending);
 
-        Toast toast = Toast.makeText(this, toastString, Toast.LENGTH_SHORT);
+        Toast toast = Toast.makeText(getActivity(), toastString, Toast.LENGTH_SHORT);
         toast.show();
 
         mAdapter.sortMessages();
     }
 
-    private void onCycleSort() {
+    public void onCycleSort() {
         SortType[] sorts = SortType.values();
         int curIndex = 0;
 
@@ -1400,8 +1100,8 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
             return;
         }
 
@@ -1437,145 +1137,51 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
     }
 
+    public void onExpunge() {
+        if (mCurrentFolder != null) {
+            onExpunge(mAccount, mCurrentFolder.name);
+        }
+    }
 
     private void onExpunge(final Account account, String folderName) {
         mController.expunge(account, folderName, null);
     }
 
-    @Override
-    public Dialog onCreateDialog(int id) {
-        switch (id) {
-        case R.id.dialog_confirm_spam:
-            return ConfirmationDialog.create(this, id,
-                                             R.string.dialog_confirm_spam_title,
-                                             "" /* text is refreshed by #onPrepareDialog(int, Dialog) below */,
-                                             R.string.dialog_confirm_spam_confirm_button,
-                                             R.string.dialog_confirm_spam_cancel_button,
-            new Runnable() {
-                @Override
-                public void run() {
-                    onSpamConfirmed(mActiveMessages);
-                    // No further need for this reference
-                    mActiveMessages = null;
-                }
-            }, new Runnable() {
-                @Override
-                public void run() {
-                    // event for cancel, we don't need this reference any more
-                    mActiveMessages = null;
-                }
-            });
-        }
+    private void showDialog(int dialogId) {
+        DialogFragment fragment;
+        switch (dialogId) {
+            case R.id.dialog_confirm_spam: {
+                String title = getString(R.string.dialog_confirm_spam_title);
 
-        return super.onCreateDialog(id);
-    }
+                int selectionSize = mActiveMessages.size();
+                String message = getResources().getQuantityString(
+                        R.plurals.dialog_confirm_spam_message, selectionSize,
+                        Integer.valueOf(selectionSize));
 
-    /*
-     * (non-Javadoc)
-     *
-     * Android happens to invoke this method even if the given dialog is not
-     * shown (eg. a dismissed dialog) as part of the automatic activity
-     * reloading following a configuration change (orientation, keyboard,
-     * locale, etc.).
-     */
-    @Override
-    public void onPrepareDialog(final int id, final Dialog dialog) {
-        switch (id) {
-        case R.id.dialog_confirm_spam: {
-            // mActiveMessages can be null if Android restarts the activity
-            // while this dialog is not actually shown (but was displayed at
-            // least once)
-            if (mActiveMessages != null) {
-                final int selectionSize = mActiveMessages.size();
-                final String message;
-                message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize,
-                          Integer.valueOf(selectionSize));
-                ((AlertDialog) dialog).setMessage(message);
+                String confirmText = getString(R.string.dialog_confirm_spam_confirm_button);
+                String cancelText = getString(R.string.dialog_confirm_spam_cancel_button);
+
+                fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
+                        confirmText, cancelText);
+                break;
             }
-            break;
-        }
-        default: {
-            super.onPrepareDialog(id, dialog);
-        }
-        }
-    }
-
-    private void onToggleFlag(MessageInfoHolder messageInfo) {
-        Message message = messageInfo.message;
-        Folder folder = message.getFolder();
-        Account account = folder.getAccount();
-        String folderName = folder.getName();
-
-        mController.setFlag(account, folderName, new Message[] { message }, Flag.FLAGGED,
-                !messageInfo.flagged);
-
-        messageInfo.flagged = !messageInfo.flagged;
-        mAdapter.sortMessages();
-
-        computeBatchDirection();
-    }
-
-    private void checkMail(Account account, String folderName) {
-        mController.synchronizeMailbox(account, folderName, mAdapter.mListener, null);
-        mController.sendPendingMessages(account, mAdapter.mListener);
-    }
-
-    /**
-     * We need to do some special clean up when leaving a remote search result screen.  If no remote search is
-     * in progress, this method does nothing special.
-     */
-    @Override
-    public void onBackPressed() {
-        // If we represent a remote search, then kill that before going back.
-        if (mSearchAccount != null && mSearchFolder != null && mRemoteSearchFuture != null) {
-            try {
-                Log.i(K9.LOG_TAG, "Remote search in progress, attempting to abort...");
-                // Canceling the future stops any message fetches in progress.
-                final boolean cancelSuccess = mRemoteSearchFuture.cancel(true);   // mayInterruptIfRunning = true
-                if (!cancelSuccess) {
-                    Log.e(K9.LOG_TAG, "Could not cancel remote search future.");
-                }
-                // Closing the folder will kill off the connection if we're mid-search.
-                final Account searchAccount = Preferences.getPreferences(this).getAccount(mSearchAccount);
-                final Store remoteStore = searchAccount.getRemoteStore();
-                final Folder remoteFolder = remoteStore.getFolder(mSearchFolder);
-                remoteFolder.close();
-                // Send a remoteSearchFinished() message for good measure.
-                mAdapter.mListener.remoteSearchFinished(searchAccount, mSearchFolder, 0, null);
-            } catch (Exception e) {
-                // Since the user is going back, log and squash any exceptions.
-                Log.e(K9.LOG_TAG, "Could not abort remote search before going back", e);
+            default: {
+                throw new RuntimeException("Called showDialog(int) with unknown dialog id.");
             }
         }
-        super.onBackPressed();
+
+        fragment.setTargetFragment(this, dialogId);
+        fragment.show(getFragmentManager(), getDialogTag(dialogId));
+    }
+
+    private String getDialogTag(int dialogId) {
+        return String.format("dialog-%d", dialogId);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
         switch (itemId) {
-        case android.R.id.home: {
-            if (mIntegrate) {
-                // If we were in one of the integrated mailboxes (think All Mail or Integrated Inbox), then
-                // go to accounts.
-                onAccounts();
-            } else if (mQueryString != null) {
-                // We did a search of some sort.  Go back to wherever the user searched from.
-                onBackPressed();
-            } else {
-                // In a standard message list of a folder.  Go to folder list.
-                onShowFolderList();
-            }
-            return true;
-        }
-        case R.id.compose: {
-            onCompose();
-            return true;
-        }
-        case R.id.check_mail: {
-            checkMail(mAccount, mFolderName);
-            return true;
-        }
         case R.id.set_sort_date: {
             changeSort(SortType.SORT_DATE);
             return true;
@@ -1608,21 +1214,6 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             setSelectionState(true);
             return true;
         }
-        case R.id.app_settings: {
-            onEditPrefs();
-            return true;
-        }
-        case R.id.search_remote: {
-            // Remote search is useless without the network.
-            if (mHasConnectivity) {
-                onRemoteSearchRequested(true);
-            } else {
-                final Toast unavailableToast =
-                    Toast.makeText(context, getText(R.string.remote_search_unavailable_no_network), Toast.LENGTH_SHORT);
-                unavailableToast.show();
-            }
-            return true;
-        }
         }
 
         if (mQueryString != null) {
@@ -1633,17 +1224,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
 
         switch (itemId) {
         case R.id.send_messages: {
-            mController.sendPendingMessages(mAccount, mAdapter.mListener);
-            return true;
-        }
-        case R.id.folder_settings: {
-            if (mFolderName != null) {
-                FolderSettings.actionSettings(this, mAccount, mFolderName);
-            }
-            return true;
-        }
-        case R.id.account_settings: {
-            onEditAccount();
+            onSendPendingMessages();
             return true;
         }
         case R.id.expunge: {
@@ -1657,6 +1238,11 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
         }
     }
+
+    public void onSendPendingMessages() {
+        mController.sendPendingMessages(mAccount, mAdapter.mListener);
+    }
+
     @Override
     public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
@@ -1683,8 +1269,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                     break;
                 }
                 case R.id.same_sender: {
-                    MessageList.actionHandle(MessageList.this, "From " + message.sender,
-                        message.senderAddress, false, null, null);
+                    mFragmentListener.showMoreFromSameSender(message.senderAddress);
                     break;
                 }
                 case R.id.delete: {
@@ -1742,7 +1327,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             return;
         }
 
-        getMenuInflater().inflate(R.menu.message_list_item_context, menu);
+        getActivity().getMenuInflater().inflate(R.menu.message_list_item_context, menu);
 
         menu.setHeaderTitle(message.message.getSubject());
 
@@ -1779,70 +1364,11 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
 
     }
 
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getSupportMenuInflater().inflate(R.menu.message_list_option, menu);
-        mRefreshMenuItem = menu.findItem(R.id.check_mail);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-
-        if (mQueryString != null || mIntegrate) {
-            menu.findItem(R.id.expunge).setVisible(false);
-            menu.findItem(R.id.check_mail).setVisible(false);
-            menu.findItem(R.id.send_messages).setVisible(false);
-            menu.findItem(R.id.folder_settings).setVisible(false);
-            menu.findItem(R.id.account_settings).setVisible(false);
-            // If this is an explicit local search, show the option to search the cloud.
-
-            final Preferences prefs = Preferences.getPreferences(getApplicationContext());
-
-            boolean allowRemoteSearch = false;
-            if (mSearchAccount != null) {
-                final Account searchAccount = prefs.getAccount(mSearchAccount);
-                if (searchAccount != null) {
-                    allowRemoteSearch = searchAccount.allowRemoteSearch();
-                }
-            }
-
-            if (allowRemoteSearch && mQueryString != null && !mRemoteSearch && !mIntegrate && mSearchFolder != null) {
-                menu.findItem(R.id.search_remote).setVisible(true);
-            }
-        } else {
-            if (mCurrentFolder != null && mCurrentFolder.name.equals(mAccount.getOutboxFolderName())) {
-                menu.findItem(R.id.check_mail).setVisible(false);
-            } else {
-                menu.findItem(R.id.send_messages).setVisible(false);
-            }
-
-            if (mCurrentFolder != null && K9.ERROR_FOLDER_NAME.equals(mCurrentFolder.name)) {
-                menu.findItem(R.id.expunge).setVisible(false);
-            }
-
-            if (!mController.isMoveCapable(mAccount)) {
-                // FIXME: Really we want to do this for all local-only folders
-                if (mCurrentFolder != null &&
-                        !mAccount.getInboxFolderName().equals(mCurrentFolder.name)) {
-                    menu.findItem(R.id.check_mail).setVisible(false);
-                }
-                menu.findItem(R.id.expunge).setVisible(false);
-            }
-        }
-
-        return true;
-    }
-
-    @Override
     public void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
         // Handle right-to-left as an un-select
         handleSwipe(e1, false);
     }
 
-    @Override
     public void onSwipeLeftToRight(final MotionEvent e1, final MotionEvent e2) {
         // Handle left-to-right as a select.
         handleSwipe(e1, true);
@@ -1875,9 +1401,9 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             public void remoteSearchAddMessage(Account account, String folderName, Message message, final int numDone, final int numTotal) {
 
                 if (numTotal > 0 && numDone < numTotal) {
-                    setSupportProgress(Window.PROGRESS_END / numTotal * numDone);
+                    mFragmentListener.setMessageListProgress(Window.PROGRESS_END / numTotal * numDone);
                 } else {
-                    setSupportProgress(Window.PROGRESS_END);
+                    mFragmentListener.setMessageListProgress(Window.PROGRESS_END);
                 }
 
                 mHandler.addOrUpdateMessages(account, folderName, Collections.singletonList(message), false);
@@ -1886,9 +1412,10 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             @Override
             public void remoteSearchFailed(Account acct, String folder, final String err) {
                 //TODO: Better error handling
-                runOnUiThread(new Runnable() {
+                mHandler.post(new Runnable() {
+                    @Override
                     public void run() {
-                        Toast.makeText(getApplication(),  err, Toast.LENGTH_LONG).show();
+                        Toast.makeText(getActivity(), err, Toast.LENGTH_LONG).show();
                     }
                 });
             }
@@ -1909,7 +1436,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 } else {
                     mHandler.updateFooter("", false);
                 }
-                setSupportProgress(Window.PROGRESS_END);
+                mFragmentListener.setMessageListProgress(Window.PROGRESS_END);
 
             }
 
@@ -1921,7 +1448,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 } else {
                     mHandler.updateFooter(getString(R.string.remote_search_downloading, numResults), true);
                 }
-                setSupportProgress(Window.PROGRESS_START);
+                mFragmentListener.setMessageListProgress(Window.PROGRESS_START);
             }
 
             @Override
@@ -2212,7 +1739,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                         if (updateForMe(account, folderName)) {
                             m = new MessageInfoHolder();
                             FolderInfoHolder folderInfoHolder = new FolderInfoHolder(
-                                    MessageList.this, messageFolder, messageAccount);
+                                    getActivity(), messageFolder, messageAccount);
                             messageHelper.populate(m, message, folderInfoHolder, messageAccount);
                             messagesToAdd.add(m);
                         } else {
@@ -2222,7 +1749,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                                 } else {
                                     m = new MessageInfoHolder();
                                     FolderInfoHolder folderInfoHolder = new FolderInfoHolder(
-                                            MessageList.this, messageFolder, messageAccount);
+                                            getActivity(), messageFolder, messageAccount);
                                     messageHelper.populate(m, message, folderInfoHolder,
                                             messageAccount);
                                     messagesToAdd.add(m);
@@ -2231,7 +1758,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                         }
                     } else {
                         m.dirty = false; // as we reload the message, unset its dirty flag
-                        FolderInfoHolder folderInfoHolder = new FolderInfoHolder(MessageList.this,
+                        FolderInfoHolder folderInfoHolder = new FolderInfoHolder(getActivity(),
                                 messageFolder, account);
                         messageHelper.populate(m, message, folderInfoHolder, account);
                         needsSort = true;
@@ -2328,7 +1855,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             try {
                 LocalStore localStore = account.getLocalStore();
                 local_folder = localStore.getFolder(folder);
-                return new FolderInfoHolder(context, local_folder, account);
+                return new FolderInfoHolder(getActivity(), local_folder, account);
             } catch (Exception e) {
                 Log.e(K9.LOG_TAG, "getFolder(" + folder + ") goes boom: ", e);
                 return null;
@@ -2489,7 +2016,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                         R.attr.messageListUnreadItemBackgroundColor;
 
                 TypedValue outValue = new TypedValue();
-                getTheme().resolveAttribute(res, outValue, true);
+                getActivity().getTheme().resolveAttribute(res, outValue, true);
                 view.setBackgroundColor(outValue.data);
             }
 
@@ -2706,7 +2233,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
 
         if (selected) {
             mSelectedCount = mAdapter.getCount();
-            mActionMode = MessageList.this.startActionMode(mActionModeCallback);
+            mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
             updateActionModeTitle();
             computeSelectAllVisibility();
             computeBatchDirection();
@@ -2725,7 +2252,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 return;
             }
         } else {
-            mActionMode = startActionMode(mActionModeCallback);
+            mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
         }
 
         if (holder.selected) {
@@ -2803,6 +2330,8 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
         mController.setFlag(messageList, flag, newState);
         mAdapter.sortMessages();
+
+        computeBatchDirection();
     }
 
     /**
@@ -2852,7 +2381,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
      * @see #startActivityForResult(Intent, int)
      */
     private void displayFolderChoice(final int requestCode, final Folder folder, final List<MessageInfoHolder> holders) {
-        final Intent intent = new Intent(this, ChooseFolder.class);
+        final Intent intent = new Intent(getActivity(), ChooseFolder.class);
         intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, folder.getAccount().getUuid());
         intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, folder.getName());
         intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, folder.getAccount().getLastSelectedFolderName());
@@ -2934,7 +2463,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             }
             // message check
             if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
-                final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
+                final Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message,
                                                    Toast.LENGTH_LONG);
                 toast.show();
                 return false;
@@ -3032,7 +2561,7 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
                 return;
             }
             if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
-                final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message,
+                final Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message,
                                                    Toast.LENGTH_LONG);
                 toast.show();
 
@@ -3054,13 +2583,6 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
         }
     }
 
-    protected void onAccountUnavailable() {
-        finish();
-        // TODO inform user about account unavailability using Toast
-        Accounts.listAccounts(this);
-    }
-
-
     /**
      * Return the currently "open" account if available.
      *
@@ -3229,22 +2751,18 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             }
             case R.id.mark_as_read: {
                 setFlag(selection, Flag.SEEN, true);
-                computeBatchDirection();
                 break;
             }
             case R.id.mark_as_unread: {
                 setFlag(selection, Flag.SEEN, false);
-                computeBatchDirection();
                 break;
             }
             case R.id.flag: {
                 setFlag(selection, Flag.FLAGGED, true);
-                computeBatchDirection();
                 break;
             }
             case R.id.unflag: {
                 setFlag(selection, Flag.FLAGGED, false);
-                computeBatchDirection();
                 break;
             }
             case R.id.select_all: {
@@ -3281,5 +2799,246 @@ public class MessageListFragment extends K9ListActivity implements OnItemClickLi
             return true;
         }
     }
-}
 
+    @Override
+    public void doPositiveClick(int dialogId) {
+        switch (dialogId) {
+            case R.id.dialog_confirm_spam: {
+                onSpamConfirmed(mActiveMessages);
+                // No further need for this reference
+                mActiveMessages = null;
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void doNegativeClick(int dialogId) {
+        switch (dialogId) {
+            case R.id.dialog_confirm_spam: {
+                // No further need for this reference
+                mActiveMessages = null;
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void dialogCancelled(int dialogId) {
+        doNegativeClick(dialogId);
+    }
+
+    public void checkMail() {
+        mController.synchronizeMailbox(mAccount, mFolderName, mAdapter.mListener, null);
+        mController.sendPendingMessages(mAccount, mAdapter.mListener);
+    }
+
+    /**
+     * We need to do some special clean up when leaving a remote search result screen.  If no remote search is
+     * in progress, this method does nothing special.
+     */
+    @Override
+    public void onStop() {
+        // If we represent a remote search, then kill that before going back.
+        if (mSearchAccount != null && mSearchFolder != null && mRemoteSearchFuture != null) {
+            try {
+                Log.i(K9.LOG_TAG, "Remote search in progress, attempting to abort...");
+                // Canceling the future stops any message fetches in progress.
+                final boolean cancelSuccess = mRemoteSearchFuture.cancel(true);   // mayInterruptIfRunning = true
+                if (!cancelSuccess) {
+                    Log.e(K9.LOG_TAG, "Could not cancel remote search future.");
+                }
+                // Closing the folder will kill off the connection if we're mid-search.
+                Context appContext = getActivity().getApplicationContext();
+                final Account searchAccount = Preferences.getPreferences(appContext).getAccount(mSearchAccount);
+                final Store remoteStore = searchAccount.getRemoteStore();
+                final Folder remoteFolder = remoteStore.getFolder(mSearchFolder);
+                remoteFolder.close();
+                // Send a remoteSearchFinished() message for good measure.
+                mAdapter.mListener.remoteSearchFinished(searchAccount, mSearchFolder, 0, null);
+            } catch (Exception e) {
+                // Since the user is going back, log and squash any exceptions.
+                Log.e(K9.LOG_TAG, "Could not abort remote search before going back", e);
+            }
+        }
+        super.onStop();
+    }
+
+    public ArrayList<MessageReference> getMessageReferences() {
+        ArrayList<MessageReference> messageRefs = new ArrayList<MessageReference>();
+
+        for (MessageInfoHolder holder : mAdapter.getMessages()) {
+            MessageReference ref = holder.message.makeMessageReference();
+            messageRefs.add(ref);
+        }
+
+        return messageRefs;
+    }
+
+    public void selectAll() {
+        setSelectionState(true);
+    }
+
+    public void onMoveUp() {
+        int currentPosition = mListView.getSelectedItemPosition();
+        if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
+            currentPosition = mListView.getFirstVisiblePosition();
+        }
+        if (currentPosition > 0) {
+            mListView.setSelection(currentPosition - 1);
+        }
+    }
+
+    public void onMoveDown() {
+        int currentPosition = mListView.getSelectedItemPosition();
+        if (currentPosition == AdapterView.INVALID_POSITION || mListView.isInTouchMode()) {
+            currentPosition = mListView.getFirstVisiblePosition();
+        }
+
+        if (currentPosition < mListView.getCount()) {
+            mListView.setSelection(currentPosition + 1);
+        }
+    }
+
+    public interface MessageListFragmentListener {
+        void setMessageListProgress(int level);
+        void remoteSearch(String searchAccount, String searchFolder, String queryString);
+        void showMoreFromSameSender(String senderAddress);
+        void onResendMessage(Message message);
+        void onForward(Message message);
+        void onReply(Message message);
+        void onReplyAll(Message message);
+        void openMessage(MessageReference messageReference);
+        void setMessageListTitle(String title);
+        void setMessageListSubTitle(String subTitle);
+        void setUnreadCount(int unread);
+        void onCompose(Account account);
+        boolean startSearch(Account account, String folderName);
+    }
+
+    public void onReverseSort() {
+        changeSort(mSortType);
+    }
+
+    private MessageInfoHolder getSelection() {
+        return (MessageInfoHolder) mListView.getSelectedItem();
+    }
+
+    public void onDelete() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            onDelete(Collections.singletonList(message));
+        }
+    }
+
+    public void toggleMessageSelect() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            toggleMessageSelect(message);
+        }
+    }
+
+    public void onToggleFlag() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            setFlag(Collections.singletonList(message), Flag.FLAGGED, !message.flagged);
+        }
+    }
+
+    public void onMove() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            onMove(Collections.singletonList(message));
+        }
+    }
+
+    public void onArchive() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            onArchive(Collections.singletonList(message));
+        }
+    }
+
+    public void onCopy() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            onCopy(Collections.singletonList(message));
+        }
+    }
+
+    public void onToggleRead() {
+        MessageInfoHolder message = getSelection();
+        if (message != null) {
+            setFlag(Collections.singletonList(message), Flag.SEEN, !message.read);
+        }
+    }
+
+    public boolean isSearchQuery() {
+        return (mQueryString != null || mIntegrate);
+    }
+
+    public boolean isOutbox() {
+        return (mFolderName != null && mFolderName.equals(mAccount.getOutboxFolderName()));
+    }
+
+    public boolean isErrorFolder() {
+        return K9.ERROR_FOLDER_NAME.equals(mFolderName);
+    }
+
+    public boolean isRemoteFolder() {
+        if (isSearchQuery() || isOutbox() || isErrorFolder()) {
+            return false;
+        }
+
+        if (!mController.isMoveCapable(mAccount)) {
+            // For POP3 accounts only the Inbox is a remote folder.
+            return (mFolderName != null && !mFolderName.equals(mAccount.getInboxFolderName()));
+        }
+
+        return true;
+    }
+
+    public boolean isAccountExpungeCapable() {
+        try {
+            return (mAccount != null && mAccount.getRemoteStore().isExpungeCapable());
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public void onRemoteSearch() {
+        // Remote search is useless without the network.
+        if (mHasConnectivity) {
+            onRemoteSearchRequested(true);
+        } else {
+            Toast.makeText(getActivity(), getText(R.string.remote_search_unavailable_no_network),
+                    Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public boolean isRemoteSearch() {
+        return mRemoteSearch;
+    }
+
+    public boolean isRemoteSearchAllowed() {
+        if (!isSearchQuery() || mRemoteSearch || mSearchFolder == null || mSearchAccount == null) {
+            return false;
+        }
+
+        Context appContext = getActivity().getApplicationContext();
+        final Preferences prefs = Preferences.getPreferences(appContext);
+
+        boolean allowRemoteSearch = false;
+        final Account searchAccount = prefs.getAccount(mSearchAccount);
+        if (searchAccount != null) {
+            allowRemoteSearch = searchAccount.allowRemoteSearch();
+        }
+
+        return allowRemoteSearch;
+    }
+
+    public boolean onSearchRequested() {
+        String folderName = (mCurrentFolder != null) ? mCurrentFolder.name : null;
+        return mFragmentListener.startSearch(mAccount, folderName);
+   }
+}
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index b8029c1d0..1e351d057 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -27,6 +27,7 @@ import com.fsck.k9.activity.MessageInfoHolder;
 import com.fsck.k9.activity.MessageList;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
+import com.fsck.k9.fragment.MessageListFragment;
 import com.fsck.k9.helper.MessageHelper;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Folder;
@@ -221,35 +222,35 @@ public class MessageProvider extends ContentProvider {
             return source.message.getFolder().getAccount().getDescription();
         }
     }
-        
+
     public static class AccountColorExtractor implements FieldExtractor<MessageInfoHolder, Integer> {
         @Override
         public Integer getField(final MessageInfoHolder source) {
             return source.message.getFolder().getAccount().getChipColor();
         }
     }
-    
+
     public static class AccountNumberExtractor implements FieldExtractor<MessageInfoHolder, Integer> {
         @Override
         public Integer getField(final MessageInfoHolder source) {
             return source.message.getFolder().getAccount().getAccountNumber();
         }
     }
-    
+
     public static class HasAttachmentsExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
         @Override
         public Boolean getField(final MessageInfoHolder source) {
             return source.message.hasAttachments();
         }
     }
-    
+
     public static class HasStarExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
         @Override
         public Boolean getField(final MessageInfoHolder source) {
             return source.message.isSet(Flag.FLAGGED);
         }
     }
-    
+
     public static class UnreadExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
         @Override
         public Boolean getField(final MessageInfoHolder source) {
@@ -307,8 +308,8 @@ public class MessageProvider extends ContentProvider {
             final List<MessageInfoHolder> holders = queue.take();
 
             // TODO add sort order parameter
-            Collections.sort(holders, new MessageList.ReverseComparator<MessageInfoHolder>(
-                                 new MessageList.DateComparator()));
+            Collections.sort(holders, new MessageListFragment.ReverseComparator<MessageInfoHolder>(
+                                 new MessageListFragment.DateComparator()));
 
             final String[] projectionToUse;
             if (projection == null) {
@@ -393,7 +394,7 @@ public class MessageProvider extends ContentProvider {
         private static final String FIELD_ACCOUNT_NAME = "accountName";
         private static final String FIELD_ACCOUNT_UUID = "accountUuid";
         private static final String FIELD_ACCOUNT_COLOR = "accountColor";
-    	
+
         @Override
         public String getPath() {
             return "accounts";
@@ -408,33 +409,33 @@ public class MessageProvider extends ContentProvider {
         public Cursor getAllAccounts(String[] projection) {
             // Default projection
             if(projection == null) {
-                projection = new String[] { FIELD_ACCOUNT_NUMBER, FIELD_ACCOUNT_NAME };        		
+                projection = new String[] { FIELD_ACCOUNT_NUMBER, FIELD_ACCOUNT_NAME };
             }
-            
+
 
             MatrixCursor ret = new MatrixCursor(projection);
 
             for (Account account : Preferences.getPreferences(getContext()).getAccounts()) {
                 Object[] values = new Object[projection.length];
-                
+
                 // Build account row
                 int fieldIndex = 0;
                 for(String field : projection) {
-                	
-                	if(FIELD_ACCOUNT_NUMBER.equals(field)) {
-                    	values[fieldIndex] = account.getAccountNumber();                		
-                	} else if(FIELD_ACCOUNT_NAME.equals(field)) {
-                    	values[fieldIndex] = account.getDescription();                		
-                	} else if(FIELD_ACCOUNT_UUID.equals(field)) {
-                    	values[fieldIndex] = account.getUuid();                		
-                	} else if(FIELD_ACCOUNT_COLOR.equals(field)) {
-                    	values[fieldIndex] = account.getChipColor();                		
-                	} else {
-                		values[fieldIndex] = null;
-                	}
-                	++fieldIndex;
+
+                    if(FIELD_ACCOUNT_NUMBER.equals(field)) {
+                        values[fieldIndex] = account.getAccountNumber();
+                    } else if(FIELD_ACCOUNT_NAME.equals(field)) {
+                        values[fieldIndex] = account.getDescription();
+                    } else if(FIELD_ACCOUNT_UUID.equals(field)) {
+                        values[fieldIndex] = account.getUuid();
+                    } else if(FIELD_ACCOUNT_COLOR.equals(field)) {
+                        values[fieldIndex] = account.getChipColor();
+                    } else {
+                        values[fieldIndex] = null;
+                    }
+                    ++fieldIndex;
                 }
-                
+
                 ret.addRow(values);
             }