bugfix; adopt mail config in order to setup tool labs mail support

Change-Id: I9d589c1228a7b563f1b1af1933a0970fff2988f3