Fix bug #3419 ‘Saving/appending messages to an mbox file violates RFC#4155’

RFC4155 is informative, anyway, this makes message separator headers
conform to qmail mboxrd format: http://qmail.org./man/man5/mbox.html

Original patch thanks to Johan Vromans.

diff --git a/AUTHORS b/AUTHORS
index 2ad7a3cf62a6e400ecfa653e462b4fea7e103c83..2f1d7f5ac256e9fd3b6a9c70a3c1af3b15812b49 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -311,3 +311,4 @@ contributors (in addition to the above; based on Changelog)
        H. Merijn Brand
        Anton Butanaev
        Daniel Zaoui
+       Johan Vromans

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 6bb50529d4be2d867f0491e9aef8bd54821f2599..056296a02f4c8c4bbe8542cc3a850f158812c779 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -278,6 +278,7 @@ static char *CONTRIBS_LIST[] = {
 "Petr Vanek",
 "Jeroen Versteeg",
 "Kevin Vigor",
+"Johan Vromans",
 "Botalov Vyacheslav",
 "Radek Vybiral",
 "Jonathan Ware",

diff --git a/src/plugins/mailmbox/mailmbox.c b/src/plugins/mailmbox/mailmbox.c
index 500d0263cf6d220804508e895fe4dd1efbbdccee..3de488d80248e21499b20bcb61c63f4cb41e0f51 100644 (file)
--- a/src/plugins/mailmbox/mailmbox.c
+++ b/src/plugins/mailmbox/mailmbox.c
@@ -615,7 +615,7 @@ claws_mailmbox_append_message_list_no_lock(struct claws_mailmbox_folder * folder
   date = time(NULL);
   from_size = strlen(DEFAULT_FROM_LINE);
   if (localtime_r(&date, &time_info) != NULL)
-    from_size = strftime(from_line, MAX_FROM_LINE_SIZE, "From - %c\n", &time_info);
+    from_size = strftime(from_line, MAX_FROM_LINE_SIZE, "From - %a %b %_2d %T %Y\n", &time_info);
 
   extra_size = 0;
   for(i = 0 ; i < carray_count(append_tab) ; i ++) {