diff --git a/src/alerter.cpp b/src/alerter.cpp
index e694779..93ce412 100644
--- a/src/alerter.cpp
+++ b/src/alerter.cpp
@@ -88,8 +88,8 @@ bool Alerter::sendEmail(const std::string& subject, const std::string& body) {
     // Build the full message (headers + blank line + body).
     std::ostringstream msg;
     msg << "Date: " << rfc5322Date() << "\r\n"
-        << "From: WeatherDisplay <" << gmailUser_ << ">\r\n"
-        << "To: <" << recipient_ << ">\r\n"
+        << "From: WeatherDisplay <" << stripCRLF(gmailUser_) << ">\r\n"
+        << "To: <" << stripCRLF(recipient_) << ">\r\n"
         << "Subject: " << stripCRLF(subject) << "\r\n"
         << "Content-Type: text/plain; charset=UTF-8\r\n"
         << "\r\n"