Continue to fix "Bug 284673 - Regression: Forwarded messages are not marked as such in the message list" CCBUG: 284673 (cherry picked from commit ade161ce)