Merge pull request #2942 from mozilla/issue_2941_stage_update_row

update entire row when staging email