Minor fixes for GMAIL parsing regression