Email template fixes

 * Better wrapping
 * No spacers