diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
index 36d1db1777..84ce181842 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
@@ -633,7 +633,8 @@ public class SubmitLogFragment extends Fragment {
     Map<String, Boolean> disk         = FeatureFlags.getDiskValues();
     Map<String, Boolean> forced       = FeatureFlags.getForcedValues();
     int                  remoteLength = Stream.of(memory.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
-    int                  forcedLength = Stream.of(disk.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    int                  diskLength   = Stream.of(disk.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
+    int                  forcedLength = Stream.of(forced.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
 
     out.append("-- Memory\n");
     for (Map.Entry<String, Boolean> entry : memory.entrySet()) {
@@ -643,7 +644,7 @@ public class SubmitLogFragment extends Fragment {
 
     out.append("-- Disk\n");
     for (Map.Entry<String, Boolean> entry : disk.entrySet()) {
-      out.append(Util.rightPad(entry.getKey(), forcedLength)).append(": ").append(entry.getValue()).append("\n");
+      out.append(Util.rightPad(entry.getKey(), diskLength)).append(": ").append(entry.getValue()).append("\n");
     }
     out.append("\n");
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 9c0cade9c3..d82d552a58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -58,6 +58,7 @@ public final class FeatureFlags {
    * We will only store remote values for flags in this set. If you want a flag to be controllable
    * remotely, place it in here.
    */
+
   private static final Set<String> REMOTE_CAPABLE = Sets.newHashSet(
       PINS_FOR_ALL,
       PINS_MEGAPHONE_KILL_SWITCH