[IMP] improve code to display signature properly in mail