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

patch by Blatinox

diff --git a/src/compose.c b/src/compose.c
index d356f2a1927a5697ee39101ffcf75c12e84f1bb5..14f81cc7edf241489a1c4123234922676674dacb 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -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;
 }