added emailtext plus some other fixes
added emailtext plus some fixes