diff --git a/src/mu-msg-str.c b/src/mu-msg-str.c
index b9e05073..ca555c62 100644
--- a/src/mu-msg-str.c
+++ b/src/mu-msg-str.c
@@ -57,7 +57,7 @@ mu_msg_str_date_s (time_t t)
 
 	tmbuf = localtime(&t);
 	
-	strftime (buf, sizeof(buf), "%c", tmbuf);
+	strftime (buf, sizeof(buf), "%x", tmbuf);
 
 	return buf;
 }
diff --git a/src/tests/test-mu-msg-str.c b/src/tests/test-mu-msg-str.c
index 937f50b0..21184ee0 100644
--- a/src/tests/test-mu-msg-str.c
+++ b/src/tests/test-mu-msg-str.c
@@ -17,7 +17,7 @@
 **  
 */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 #include "config.h"
 #endif /*HAVE_CONFIG_H*/
 
@@ -41,7 +41,7 @@ test_mu_msg_str_date_01 (void)
 
 	some_time = 1234567890;
 	tmbuf = localtime (&some_time);
-	strftime (buf, 64, "%c", tmbuf);
+	strftime (buf, 64, "%x", tmbuf);
 
 	/*  $ date -ud@1234567890; Fri Feb 13 23:31:30 UTC 2009 */
 	g_assert_cmpstr (mu_msg_str_date_s (some_time), ==, buf);
@@ -49,7 +49,7 @@ test_mu_msg_str_date_01 (void)
 	/* date -ud@987654321 Thu Apr 19 04:25:21 UTC 2001 */
 	some_time = 987654321;
 	tmbuf = localtime (&some_time);
-	strftime (buf, 64, "%c", tmbuf);
+	strftime (buf, 64, "%x", tmbuf);
 	tmp = mu_msg_str_date (some_time);
 	
 	g_assert_cmpstr (tmp, ==, buf);