Fixed quick reply and template modifications