diff --git a/include/EmailNotification.php b/include/EmailNotification.php
index 78912c0b96..8861e8f5d8 100644
--- a/include/EmailNotification.php
+++ b/include/EmailNotification.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once('include/email.php');
+
 class EmailNotification {
 	/**
 	 * Send a multipart/alternative message with Text and HTML versions
@@ -12,6 +15,10 @@ class EmailNotification {
 	 * @param textVersion		text only version of the message
 	 */
 	static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) {
+
+		$fromName = email_header_encode($fromName,'UTF-8'); 
+		$messageSubject = email_header_encode($messageSubject,'UTF-8');
+		
 		
 		// generate a mime boundary
 		$mimeBoundary   =rand(0,9)."-"
diff --git a/include/email.php b/include/email.php
index a36d9adab9..b340845490 100644
--- a/include/email.php
+++ b/include/email.php
@@ -205,4 +205,6 @@ function email_header_encode($in_str, $charset) {
         $out_str = $start . $out_str . $end;
     }
     return $out_str;
-} 
\ No newline at end of file
+} 
+
+