diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
index 70ff8029e7..ae213b248b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
@@ -181,9 +181,10 @@ public class ApplicationMigrations {
     static final int CHAT_FOLDER_STORAGE_SYNC      = 137;
     static final int SVR2_ENCLAVE_UPDATE_3         = 138;
     static final int DUPLICATE_E164_FIX_3          = 139;
+    static final int E164_FORMATTING_2             = 140;
   }
 
-  public static final int CURRENT_VERSION = 139;
+  public static final int CURRENT_VERSION = 140;
 
  /**
    * This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@@ -834,6 +835,10 @@ public class ApplicationMigrations {
       jobs.put(Version.DUPLICATE_E164_FIX_3, new DuplicateE164MigrationJob());
     }
 
+    if (lastSeenVersion < Version.E164_FORMATTING_2) {
+      jobs.put(Version.E164_FORMATTING_2, new E164FormattingMigrationJob());
+    }
+
     return jobs;
   }
 
diff --git a/core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt b/core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt
index 14b3b2ccfe..c45fd92539 100644
--- a/core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt
+++ b/core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt
@@ -61,6 +61,7 @@ class E164UtilTest {
     Assert.assertEquals("1234", formatter.formatAsE164("01234"))
     Assert.assertEquals(null, formatter.formatAsE164("0"))
     Assert.assertEquals(null, formatter.formatAsE164("0000000"))
+    Assert.assertEquals("12345", formatter.formatAsE164("012345"))
 
     formatter = E164Util.createFormatterForE164("+49 1234 567890")
     Assert.assertEquals("+491234567890", formatter.formatAsE164("+0491234567890"))