X-Account not always correct

[Redmak]

I haven't been able to determine what's happening yet but Poco sometimes uses the wrong account for replying to received mail.

For instance. I receive emails with marcel@neowin.net in the To and Envelope-To headers but the X-Account header says redmak@neowin.net

Both email addresses are Poco accounts and marcel@neowin.net is my default account (redmak@neowin.net used to be my default account)

Also when forwarding mail, redmak@neowin.net is always used.

Any ideas?