diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index dcf9feb95..5c5616630 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -5,7 +5,8 @@
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="@dimen/conversations_overview_width"
+        android:layout_width="match_parent"
+        android:layout_marginRight="@dimen/swipe_handle_size"
         android:layout_height="match_parent"
         android:background="?attr/color_background_primary"
         android:orientation="vertical" >
diff --git a/src/main/res/values-w300dp/dimens.xml b/src/main/res/values-w300dp/dimens.xml
deleted file mode 100644
index 28341a395..000000000
--- a/src/main/res/values-w300dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-	<dimen name="conversations_overview_width">276dp</dimen>
-</resources>
diff --git a/src/main/res/values-w360dp/dimens.xml b/src/main/res/values-w360dp/dimens.xml
deleted file mode 100644
index 7e37ae16e..000000000
--- a/src/main/res/values-w360dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-	<dimen name="conversations_overview_width">304dp</dimen>
-</resources>
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index 441e1103f..cf58ceb30 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -1,4 +1,6 @@
 <resources>
-	<dimen name="conversations_overview_width">336dp</dimen>
+	<!-- 384dp is the screen width of the Nexus 4. Something like a Moto G is smaller but a Nexus 5X is larger -->
+	<!-- https://material.io/devices/ -->
 	<dimen name="fineprint_size">12sp</dimen>
+	<dimen name="swipe_handle_size">48dp</dimen>
 </resources>
diff --git a/src/main/res/values-w585dp/dimens.xml b/src/main/res/values-w585dp/dimens.xml
index df6525e6e..be1f92391 100644
--- a/src/main/res/values-w585dp/dimens.xml
+++ b/src/main/res/values-w585dp/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
-	<dimen name="conversations_overview_width">416dp</dimen>
     <dimen name="activity_horizontal_margin">32dp</dimen>
+    <dimen name="swipe_handle_size">72dp</dimen>
 </resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index bd749a017..1c067396b 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -3,8 +3,8 @@
 	<dimen name="activity_horizontal_margin">8dp</dimen>
 	<dimen name="activity_vertical_margin">8dp</dimen>
 	<dimen name="infocard_padding">16dp</dimen>
-	<dimen name="conversations_overview_width">288dp</dimen>
 	<dimen name="image_button_padding">8dp</dimen>
 	<dimen name="fineprint_size">11sp</dimen>
 	<dimen name="menu_item_icon_size">24dp</dimen>
+	<dimen name="swipe_handle_size">24dp</dimen>
 </resources>