Added comments to email parser [MJ-706]