Fixing email stuff