diff --git a/headers/os/mail/E-mail.h b/headers/os/mail/E-mail.h
index 0105f6bb97..006044585c 100644
--- a/headers/os/mail/E-mail.h
+++ b/headers/os/mail/E-mail.h
@@ -41,8 +41,12 @@ enum	mail_flags			{B_MAIL_PENDING	= 1,	/* waiting to be sent*/
 
 #define B_MAIL_TYPE			"text/x-email"			/* mime type*/
 
+/* Everything past this point is deprecated. See MailMessage.h, mail_encoding.h
+	and MailDaemon.h for alternatives. */
+
+/* DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED */
+/* DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED -- DEPRECATED */
 
-/* -----------------------------------------------------------------------*/
 /* defines...*/
 
 /* schedule days */
@@ -87,7 +91,6 @@ typedef struct {
 	bool		beep;
 } mail_notification;
 
-
 /* -----------------------------------------------------------------------*/
 /* global functions...*/
 
diff --git a/headers/os/mail/mail_encoding.h b/headers/os/mail/mail_encoding.h
index eac45759f5..90765ff227 100644
--- a/headers/os/mail/mail_encoding.h
+++ b/headers/os/mail/mail_encoding.h
@@ -10,9 +10,9 @@
 #include <sys/types.h>
 
 
-#define B_MAIL_NULL_CONVERSION ((uint32) -1)
-#define B_MAIL_UTF8_CONVERSION ((uint32) -2)
+#define B_MAIL_UTF8_CONVERSION ((uint32) -1)
 // For specifying the UTF-8 character set when converting to/from UTF-8.
+#define B_MAIL_NULL_CONVERSION ((uint32) -2)
 #define B_MAIL_US_ASCII_CONVERSION ((uint32) -3)
 // Plain 7 bit ASCII character set.  A subset of UTF-8, but some mail software
 // specifies it so we need to recognize it.
diff --git a/src/kits/mail/mail_util.cpp b/src/kits/mail/mail_util.cpp
index 70c6ec17f3..74365c7d33 100644
--- a/src/kits/mail/mail_util.cpp
+++ b/src/kits/mail/mail_util.cpp
@@ -401,7 +401,6 @@ _EXPORT ssize_t rfc2047_to_utf8(char **bufp, size_t *bufLen, size_t strLen)
 				convert_id = cs->GetConversionID();
 			}
 		}
-
 		if (convert_id == B_MAIL_NULL_CONVERSION)
 		{
 			// unidentified charset