diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 1d7983a..a689c54 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -283,6 +283,8 @@
         mListView.setHeaderDividersEnabled(false);
         mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         mListView.setOnItemLongClickListener(this);
+        mListView.enableSwipe(
+                mAccount.supportsCapability(UIProvider.AccountCapabilities.ARCHIVE));
 
         // Note - we manually save/restore the listview state.
         mListView.setSaveEnabled(false);
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index fbec5bd..cfc6472 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java
@@ -38,7 +38,7 @@
 public class SwipeableListView extends ListView implements Callback {
     private SwipeHelper mSwipeHelper;
     private SwipeCompleteListener mSwipeCompleteListener;
-    private boolean ENABLE_SWIPE = true;
+    private boolean mEnableSwipe = false;
     private ListAdapter mDebugAdapter;
     private int mDebugLastCount;
 
@@ -65,6 +65,13 @@
                 scrollSlop);
     }
 
+    /**
+     * Enable swipe gestures.
+     */
+    public void enableSwipe(boolean enable) {
+        mEnableSwipe = enable;
+    }
+
     public void setSwipeCompleteListener(SwipeCompleteListener listener) {
         mSwipeCompleteListener = listener;
     }
@@ -80,7 +87,7 @@
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (ENABLE_SWIPE) {
+        if (mEnableSwipe) {
             return mSwipeHelper.onInterceptTouchEvent(ev)
                     || super.onInterceptTouchEvent(ev);
         } else {
@@ -90,7 +97,7 @@
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if (ENABLE_SWIPE) {
+        if (mEnableSwipe) {
             return mSwipeHelper.onTouchEvent(ev) || super.onTouchEvent(ev);
         } else {
             return super.onTouchEvent(ev);