X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Faccount.c;h=52066bac7a6564df61b520e3fdcd2b70b0bf815c;hp=f6b53a34724a5bcada3b5fc17245a37e2e78a7c6;hb=cb1bb1b759ef6c0978adb8475e294780e5b63cf2;hpb=65a932a8d1ed4da87694c05b99466c487659226a

diff --git a/src/account.c b/src/account.c
index f6b53a347..52066bac7 100644
--- a/src/account.c
+++ b/src/account.c
@@ -606,7 +606,8 @@ static void account_edit_prefs(void)
 	row = GPOINTER_TO_INT(clist->selection->data);
 	ac_prefs = gtk_clist_get_row_data(clist, row);
 	prev_default = ac_prefs->is_default;
-	Xstrdup_a(ac_name, ac_prefs->account_name, return);
+	Xstrdup_a(ac_name, ac_prefs->account_name ? ac_prefs->account_name : "",
+		  return);
 
 	prefs_account_open(ac_prefs);
 
@@ -614,7 +615,7 @@ static void account_edit_prefs(void)
 		account_set_as_default(ac_prefs);
 
 	if ((ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) &&
-	    ac_prefs->folder && strcmp(ac_name, ac_prefs->account_name) != 0) {
+	    ac_prefs->folder && strcmp2(ac_name, ac_prefs->account_name) != 0) {
 		folder_set_name(FOLDER(ac_prefs->folder),
 				ac_prefs->account_name);
 		folderview_rescan_all();