Fixup forward logic.

Fixes b/6843635 forward headers are not included when forwarding a message from gmail

Change-Id: If7ef212663f75d255946657a26695d48d853b8e5
1 file changed