diff --git a/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
new file mode 100644
index 000000000..8bf122395
--- /dev/null
+++ b/tests/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
@@ -0,0 +1,39 @@
+package com.fsck.k9.mail.internet;
+
+import android.test.AndroidTestCase;
+
+public class MimeUtilityTest extends AndroidTestCase {
+
+    public void testGetHeaderParameter() {
+        String result;
+
+        /* Test edge cases */
+        result = MimeUtility.getHeaderParameter(";", null);
+        assertEquals(null, result);
+
+        result = MimeUtility.getHeaderParameter("name", "name");
+        assertEquals(null, result);
+
+        result = MimeUtility.getHeaderParameter("name=", "name");
+        assertEquals("", result);
+
+        result = MimeUtility.getHeaderParameter("name=\"", "name");
+        assertEquals("\"", result);
+
+        /* Test expected cases */
+        result = MimeUtility.getHeaderParameter("name=value", "name");
+        assertEquals("value", result);
+
+        result = MimeUtility.getHeaderParameter("name = value", "name");
+        assertEquals("value", result);
+
+        result = MimeUtility.getHeaderParameter("name=\"value\"", "name");
+        assertEquals("value", result);
+
+        result = MimeUtility.getHeaderParameter("name = \"value\"" , "name");
+        assertEquals("value", result);
+
+        result = MimeUtility.getHeaderParameter("name=\"\"", "name");
+        assertEquals("", result);
+    }
+}