Tool Labs: tweak to mail config

Change-Id: I5d28fbb7b49129842a4b36fda55ac92ac0d353dd