diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
index 176ca5b84a..d2d1e5dd30 100644
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@@ -61,36 +61,36 @@ import network.loki.messenger.R;
 public class DatabaseUpgradeActivity extends BaseActivity {
   private static final String TAG = DatabaseUpgradeActivity.class.getSimpleName();
 
-  public static final int NO_MORE_KEY_EXCHANGE_PREFIX_VERSION  = 46;
-  public static final int MMS_BODY_VERSION                     = 46;
-  public static final int TOFU_IDENTITIES_VERSION              = 50;
-  public static final int CURVE25519_VERSION                   = 63;
-  public static final int ASYMMETRIC_MASTER_SECRET_FIX_VERSION = 73;
-  public static final int NO_V1_VERSION                        = 83;
-  public static final int SIGNED_PREKEY_VERSION                = 83;
-  public static final int NO_DECRYPT_QUEUE_VERSION             = 113;
-  public static final int PUSH_DECRYPT_SERIAL_ID_VERSION       = 131;
-  public static final int MIGRATE_SESSION_PLAINTEXT            = 136;
-  public static final int CONTACTS_ACCOUNT_VERSION             = 136;
-  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 151;
-  public static final int REDPHONE_SUPPORT_VERSION             = 157;
-  public static final int NO_MORE_CANONICAL_DB_VERSION         = 276;
-  public static final int PROFILES                             = 289;
-  public static final int SCREENSHOTS                          = 300;
-  public static final int PERSISTENT_BLOBS                     = 317;
-  public static final int INTERNALIZE_CONTACTS                 = 317;
-  public static final int SQLCIPHER                            = 334;
-  public static final int SQLCIPHER_COMPLETE                   = 352;
-  public static final int REMOVE_JOURNAL                       = 353;
-  public static final int REMOVE_CACHE                         = 354;
-  public static final int FULL_TEXT_SEARCH                     = 358;
-  public static final int BAD_IMPORT_CLEANUP                   = 373;
-  public static final int IMAGE_CACHE_CLEANUP                  = 406;
-  public static final int WORKMANAGER_MIGRATION                = 408;
-  public static final int COLOR_MIGRATION                      = 412;
-  public static final int UNIDENTIFIED_DELIVERY                = 422;
-  public static final int SIGNALING_KEY_DEPRECATION            = 447;
-  public static final int CONVERSATION_SEARCH                  = 455;
+  public static final int NO_MORE_KEY_EXCHANGE_PREFIX_VERSION  = 0;  // 46
+  public static final int MMS_BODY_VERSION                     = 0;  // 46
+  public static final int TOFU_IDENTITIES_VERSION              = 1;  // 50
+  public static final int CURVE25519_VERSION                   = 2;  // 63
+  public static final int ASYMMETRIC_MASTER_SECRET_FIX_VERSION = 3;  // 73
+  public static final int NO_V1_VERSION                        = 4;  // 83
+  public static final int SIGNED_PREKEY_VERSION                = 4;  // 83
+  public static final int NO_DECRYPT_QUEUE_VERSION             = 5;  // 113
+  public static final int PUSH_DECRYPT_SERIAL_ID_VERSION       = 6;  // 131
+  public static final int MIGRATE_SESSION_PLAINTEXT            = 7;  // 136
+  public static final int CONTACTS_ACCOUNT_VERSION             = 7;  // 136
+  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 8;  // 151
+  public static final int REDPHONE_SUPPORT_VERSION             = 9;  // 157
+  public static final int NO_MORE_CANONICAL_DB_VERSION         = 10; // 276
+  public static final int PROFILES                             = 11; // 289
+  public static final int SCREENSHOTS                          = 12; // 300
+  public static final int PERSISTENT_BLOBS                     = 13; // 317
+  public static final int INTERNALIZE_CONTACTS                 = 13; // 317
+  public static final int SQLCIPHER                            = 14; // 334
+  public static final int SQLCIPHER_COMPLETE                   = 15; // 352
+  public static final int REMOVE_JOURNAL                       = 16; // 353
+  public static final int REMOVE_CACHE                         = 17; // 354
+  public static final int FULL_TEXT_SEARCH                     = 18; // 358
+  public static final int BAD_IMPORT_CLEANUP                   = 19; // 373
+  public static final int IMAGE_CACHE_CLEANUP                  = 20; // 406
+  public static final int WORKMANAGER_MIGRATION                = 21; // 408
+  public static final int COLOR_MIGRATION                      = 22; // 412
+  public static final int UNIDENTIFIED_DELIVERY                = 23; // 422
+  public static final int SIGNALING_KEY_DEPRECATION            = 24; // 447
+  public static final int CONVERSATION_SEARCH                  = 25; // 455
 
   private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
     add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);