diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeepMessagesDuration.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeepMessagesDuration.java
index ecb8d9dd67..6577c5dad1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeepMessagesDuration.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeepMessagesDuration.java
@@ -11,7 +11,7 @@ public enum KeepMessagesDuration {
   FOREVER(0, R.string.preferences_storage__forever, Long.MAX_VALUE),
   ONE_YEAR(1, R.string.preferences_storage__one_year, TimeUnit.DAYS.toMillis(365)),
   SIX_MONTHS(2, R.string.preferences_storage__six_months, TimeUnit.DAYS.toMillis(183)),
-  THIRTY_DAYS(3, R.string.preferences_storage__thirty_days, TimeUnit.DAYS.toMillis(1));
+  THIRTY_DAYS(3, R.string.preferences_storage__thirty_days, TimeUnit.DAYS.toMillis(30));
 
   private final int  id;
   private final int  stringResource;