don't ignore auto-account selection when forwarding on IMAP and NNTP accounts

patch by Blatinox
This commit is contained in:
Paul 2016-11-22 09:52:06 +00:00
parent dc84b54f83
commit e7206c0db7

View file

@ -11744,9 +11744,6 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
if (msginfo->folder->prefs->enable_default_account)
account = account_find_from_id(msginfo->folder->prefs->default_account);
if (!account)
account = msginfo->folder->folder->account;
if (!account && msginfo->to && prefs_common.forward_account_autosel) {
gchar *to;
Xstrdup_a(to, msginfo->to, return NULL);
@ -11773,6 +11770,9 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
account = account_find_from_address(buf, FALSE);
}
}
if (!account)
account = msginfo->folder->folder->account;
return account;
}