Remove Text-to-Email function
Fix merging conflicts