diff --git a/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
new file mode 100644
index 000000000..496d6922e
--- /dev/null
+++ b/tests/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2012 The K-9 Dog Walkers
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.fsck.k9.mail.store.imap;
+
+import java.util.List;
+import android.test.MoreAsserts;
+import junit.framework.TestCase;
+
+public class ImapUtilityTest extends TestCase {
+    /**
+     * Test getting elements of an IMAP sequence set.
+     */
+    public void testGetImapSequenceValues() {
+        String[] expected;
+        List<String> actual;
+
+        // Test valid sets
+        expected = new String[] {"1"};
+        actual = ImapUtility.getImapSequenceValues("1");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] {"1", "3", "2"};
+        actual = ImapUtility.getImapSequenceValues("1,3,2");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] {"4", "5", "6"};
+        actual = ImapUtility.getImapSequenceValues("4:6");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] {"9", "8", "7"};
+        actual = ImapUtility.getImapSequenceValues("9:7");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] {"1", "2", "3", "4", "9", "8", "7"};
+        actual = ImapUtility.getImapSequenceValues("1,2:4,9:7");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        // Test partially invalid sets
+        expected = new String[] { "1", "5" };
+        actual = ImapUtility.getImapSequenceValues("1,x,5");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] { "1", "2", "3" };
+        actual = ImapUtility.getImapSequenceValues("a:d,1:3");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        // Test invalid sets
+        expected = new String[0];
+        actual = ImapUtility.getImapSequenceValues("");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapSequenceValues(null);
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapSequenceValues("a");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapSequenceValues("1:x");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+    }
+
+    /**
+     * Test getting elements of an IMAP range.
+     */
+    public void testGetImapRangeValues() {
+        String[] expected;
+        List<String> actual;
+
+        // Test valid ranges
+        expected = new String[] {"1", "2", "3"};
+        actual = ImapUtility.getImapRangeValues("1:3");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[] {"16", "15", "14"};
+        actual = ImapUtility.getImapRangeValues("16:14");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        // Test in-valid ranges
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues(null);
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("a");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("6");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("1:3,6");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("1:x");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+
+        expected = new String[0];
+        actual = ImapUtility.getImapRangeValues("1:*");
+        MoreAsserts.assertEquals(expected, actual.toArray());
+    }
+}