diff --git a/lib/mu-flags.c b/lib/mu-flags.c
index f5509364..d5c33677 100644
--- a/lib/mu-flags.c
+++ b/lib/mu-flags.c
@@ -61,7 +61,6 @@ mu_flag_type (MuFlags flag)
 		if (FLAG_INFO[u].flag == flag)
 			return FLAG_INFO[u].flag_type;
 
-	g_warning ("%s: invalid flag %u", __FUNCTION__, flag);
 	return MU_FLAG_TYPE_INVALID;
 }
 
@@ -74,8 +73,6 @@ mu_flag_char (MuFlags flag)
 	for (u = 0; u != G_N_ELEMENTS (FLAG_INFO); ++u)
 		if (FLAG_INFO[u].flag == flag)
 			return FLAG_INFO[u].kar;
-
-	g_warning ("%s: invalid flag %u", __FUNCTION__, flag);
 	return 0;
 }
 
@@ -90,7 +87,6 @@ mu_flag_from_char (char kar)
 		if (FLAG_INFO[u].kar == kar)
 			return FLAG_INFO[u].flag;
 
-	g_warning ("%s: invalid kar %c", __FUNCTION__, kar);
 	return MU_FLAG_INVALID;
 }
 
@@ -104,7 +100,6 @@ mu_flag_name (MuFlags flag)
 		if (FLAG_INFO[u].flag == flag)
 			return FLAG_INFO[u].name;
 
-	g_warning ("%s: invalid flags %u", __FUNCTION__, flag);
 	return NULL;
 }
 
diff --git a/lib/mu-flags.h b/lib/mu-flags.h
index 5b9f89b5..3dcd797d 100644
--- a/lib/mu-flags.h
+++ b/lib/mu-flags.h
@@ -87,7 +87,7 @@ MuFlagType mu_flag_type (MuFlags flag) G_GNUC_CONST;
  *
  * @param flag a MuFlag (single)
  *
- * @return the character, or 0 in case of error
+ * @return the character, or 0 if it's not a valid flag
  */
 char mu_flag_char (MuFlags flag) G_GNUC_CONST;
 
diff --git a/lib/tests/test-mu-msg.c b/lib/tests/test-mu-msg.c
index 281b895e..90416c2a 100644
--- a/lib/tests/test-mu-msg.c
+++ b/lib/tests/test-mu-msg.c
@@ -175,9 +175,7 @@ test_mu_msg_02 (void)
 				(MuMsgContactForeachFunc)check_contact_02,
 				&i);
 	g_assert_cmpint (i,==,2);
-
-	g_assert_cmpuint (mu_msg_get_flags(msg),
-			  ==, MU_FLAG_SEEN);
+	g_assert_cmpuint (mu_msg_get_flags(msg), ==, MU_FLAG_SEEN|MU_FLAG_LIST);
 
 	mu_msg_unref (msg);
 }