back out relevant changes that broke the tree

include/msgcom.h

@@ -574,6 +574,19 @@ typedef enum
    
 /* MSG_GROUPNAME_FLAG_* now in mailnews/base/public/nsMsgGroupnameFlags.h */
 
+typedef uint32 MSG_HEADER_SET;
+typedef enum {
+	MSG_RETURN_RECEIPT_BOOL_HEADER_MASK = 0,
+	MSG_ENCRYPTED_BOOL_HEADER_MASK,
+	MSG_SIGNED_BOOL_HEADER_MASK,
+	MSG_UUENCODE_BINARY_BOOL_HEADER_MASK,
+	MSG_ATTACH_VCARD_BOOL_HEADER_MASK,
+	MSG_LAST_BOOL_HEADER_MASK			/* last boolean header mask; must be the last one 
+										 * DON'T remove.
+										 */
+} MSG_BOOL_HEADER_SET;
+
+
 /* *_HEADER_MASK now in mailnews/base/public/nsMsgHeaderMasks.h */