diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/FlowedMessageUtils.java b/mail/common/src/main/java/com/fsck/k9/mail/internet/FormatFlowedHelper.java
similarity index 97%
rename from mail/common/src/main/java/com/fsck/k9/mail/internet/FlowedMessageUtils.java
rename to mail/common/src/main/java/com/fsck/k9/mail/internet/FormatFlowedHelper.java
index debc3e2d7..e978cb46e 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/FlowedMessageUtils.java
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/FormatFlowedHelper.java
@@ -5,7 +5,7 @@ import static com.fsck.k9.mail.internet.MimeUtility.getHeaderParameter;
 import static com.fsck.k9.mail.internet.MimeUtility.isSameMimeType;
 
 
-class FlowedMessageUtils {
+class FormatFlowedHelper {
     private static final String TEXT_PLAIN = "text/plain";
     private static final String HEADER_PARAM_FORMAT = "format";
     private static final String HEADER_FORMAT_FLOWED = "flowed";
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java b/mail/common/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
index 29e675e43..927d8745d 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
@@ -25,7 +25,7 @@ import timber.log.Timber;
 
 import static com.fsck.k9.mail.internet.CharsetSupport.fixupCharset;
 import static com.fsck.k9.mail.internet.MimeUtility.getHeaderParameter;
-import static com.fsck.k9.mail.internet.FlowedMessageUtils.isFormatFlowed;
+import static com.fsck.k9.mail.internet.FormatFlowedHelper.isFormatFlowed;
 import static com.fsck.k9.mail.internet.MimeUtility.isSameMimeType;
 import static com.fsck.k9.mail.internet.Viewable.Alternative;
 import static com.fsck.k9.mail.internet.Viewable.Html;
@@ -203,7 +203,7 @@ public class MessageExtractor {
             Viewable viewable;
             if (isSameMimeType(mimeType, "text/plain")) {
                 if (isFormatFlowed(part.getContentType())) {
-                    boolean delSp = FlowedMessageUtils.isDelSp(part.getContentType());
+                    boolean delSp = FormatFlowedHelper.isDelSp(part.getContentType());
                     viewable = new Flowed(part, delSp);
                 } else {
                     viewable = new Text(part);
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.java b/mail/common/src/test/java/com/fsck/k9/mail/internet/FormatFlowedHelperTest.java
similarity index 88%
rename from mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.java
rename to mail/common/src/test/java/com/fsck/k9/mail/internet/FormatFlowedHelperTest.java
index 509273404..dbbd56a17 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.java
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/FormatFlowedHelperTest.java
@@ -3,13 +3,13 @@ package com.fsck.k9.mail.internet;
 
 import org.junit.Test;
 
-import static com.fsck.k9.mail.internet.FlowedMessageUtils.isDelSp;
-import static com.fsck.k9.mail.internet.FlowedMessageUtils.isFormatFlowed;
+import static com.fsck.k9.mail.internet.FormatFlowedHelper.isDelSp;
+import static com.fsck.k9.mail.internet.FormatFlowedHelper.isFormatFlowed;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 
-public class FlowedMessageUtilsTest {
+public class FormatFlowedHelperTest {
     @Test
     public void isFormatFlowed_withTextPlainFormatFlowed_shouldReturnTrue() throws Exception {
         assertTrue(isFormatFlowed("text/plain; format=flowed"));