diff --git a/ChangeLog b/ChangeLog
index 6c6bab8bc..7790ef26c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* Tools/SOGoEAlarmsNotifier.m
+	(-_sendMessageWithHeaders:content:toAttendee:from:withMailer:):
+	encode sender and recipient addresses in quoted printatble.
+
 	* SoObjects/Contacts/SOGoContactGCSFolder.m
 	(-fixupContactRecord:): fallback on organization name when the
 	contact has no display name, no firstname, and no lastname.
diff --git a/NEWS b/NEWS
index 0e36006d0..17057a0f5 100644
--- a/NEWS
+++ b/NEWS
@@ -6,13 +6,14 @@ New Features
 
 Enhancements
  - contacts from the email editor now appear in a pane, like in Thunderbird
+ - improved display of contacts in Address Book module
  - added DanishDenmark translation - thanks to Altibox
  - updated German translation
  - updated SpanishArgentina translation
  - updated SpanishSpain translation
 
 Bug Fixes
- - 
+ - fixed encoding of headers in sogo-ealarm-notify
 
 1.3-20111130 (1.3.10)
 ---------------------
diff --git a/Tools/SOGoEAlarmsNotifier.m b/Tools/SOGoEAlarmsNotifier.m
index 4ef096f03..bb5982b90 100644
--- a/Tools/SOGoEAlarmsNotifier.m
+++ b/Tools/SOGoEAlarmsNotifier.m
@@ -1,6 +1,6 @@
 /* SOGoEAlarmsNotifier.m - this file is part of SOGo
  *
- * Copyright (C) 2010 Inverse inc.
+ * Copyright (C) 2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -91,7 +91,7 @@
   [headers setObject: @"quoted-printable" forKey: @"Content-Transfer-Encoding"];
 
   identity = [owner primaryIdentity];
-  fullName = [identity objectForKey: @"fullName"];
+  fullName = [[identity objectForKey: @"fullName"] asQPSubjectString: @"utf-8"];
   if ([fullName length])
     email = [NSString stringWithFormat: @"%@ <%@>", fullName,
                 [identity objectForKey: @"email"]];
@@ -109,9 +109,15 @@
                       withMailer: (SOGoMailer *) mailer
 {
   NGMimeMessage *message;
-  NSString *to;
+  NSString *to, *headerTo, *attendeeName;
 
-  [headers setObject: [attendee mailAddress] forKey: @"To"];
+  attendeeName = [[attendee cnWithoutQuotes] asQPSubjectString: @"utf-8"];
+  if ([attendeeName length])
+    headerTo = [NSString stringWithFormat: @"%@ <%@>", attendeeName,
+                         [attendee rfc822Email]];
+  else
+    headerTo = [attendee rfc822Email];
+  [headers setObject: headerTo forKey: @"To"];
   [headers setObject: [self _messageID] forKey: @"Message-Id"];
   message = [NGMimeMessage messageWithHeader: headers];
   [message setBody: content];