int rgb = 0x006400ff;
_set_display_name_with_email_addr(account->user_email_address, &(account->user_display_name));
- _set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name));
+ //_set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name));
+ if (!account->incoming_server_user_name)
+ _set_user_name_with_email_addr(account->user_email_address, &(account->incoming_server_user_name));
account->user_display_name = g_strdup(account->incoming_server_user_name);
account->reply_to_address = g_strdup(account->user_email_address);