Three fixes before your next message goes out