diff --git a/src/mu-msg-flags.c b/src/mu-msg-flags.c
index 6d7e4848..e5fe62e5 100644
--- a/src/mu-msg-flags.c
+++ b/src/mu-msg-flags.c
@@ -123,7 +123,7 @@ mu_msg_flag_char (MuMsgFlags flag)
 	case MU_MSG_FLAG_DRAFT:		return 'd';
 	case MU_MSG_FLAG_FLAGGED:	return 'f';
 
-		/* NEW OR NOT SEEN */
+	/* NEW OR NOT SEEN */
 	case MU_MSG_FLAG_UNREAD:        return 'u';
 		
 	case MU_MSG_FLAG_SIGNED:	return 'z';
diff --git a/src/mu-msg-flags.h b/src/mu-msg-flags.h
index 73a736c8..c2fce867 100644
--- a/src/mu-msg-flags.h
+++ b/src/mu-msg-flags.h
@@ -77,7 +77,7 @@ typedef enum _MuMsgFlags MuMsgFlags;
  * characters
  * D=draft,F=flagged,N=new,P=passed,R=replied,S=seen,T=trashed
  * a=has-attachment,s=signed, x=encrypted if any other characters are
- * seen, MU_MSG_FLAG_UNKNOWN is returned.
+ * seen, MU_MSG_FLAG_NONE is returned.
  * 
  * @param str a string
  * 
diff --git a/src/mu-msg-sexp.c b/src/mu-msg-sexp.c
index b46e0e11..119dbc86 100644
--- a/src/mu-msg-sexp.c
+++ b/src/mu-msg-sexp.c
@@ -20,6 +20,7 @@
 
 #include "mu-str.h"
 #include "mu-msg.h"
+#include "mu-maildir.h"
 
 static void
 append_sexp_attr (GString *gstr, const char* elm, const char *str)
@@ -182,6 +183,8 @@ mu_msg_to_sexp (MuMsg *msg, gboolean dbonly)
 	
 	append_sexp_attr (gstr, "msgid", mu_msg_get_msgid (msg));
 	append_sexp_attr (gstr, "path",	   mu_msg_get_path (msg));
+	
+	
 	append_sexp_attr (gstr, "maildir", mu_msg_get_maildir (msg));
 
 	g_string_append_printf (gstr, "\t:priority %s\n",