Index: branches/5.1.x/core/units/helpers/email_message_helper.php
===================================================================
diff -u -N -r12657 -r13140
--- branches/5.1.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 12657)
+++ branches/5.1.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 13140)
@@ -1,7 +1,7 @@
 <?php
 
 	class EmailMessageHelper extends kHelper {
-	
+
 		/**
 		 * Extracts Subject, Headers, Body fields from email message translation
 		 *
@@ -27,17 +27,51 @@
 					$headers[] = $line;
 				}
 			}
-			
+
 			$ret['Headers'] = implode("\n", $headers);
 
 			$message_body = '';
 			while ((list($line_id,$line) = each($lines))) {
 				$message_body .= $line;
 			}
-			
+
 			$ret['Body'] = $message_body;
-			
+
 			return $ret;
 		}
-		
+
+		/**
+		 * Prepares email event content for language pack export
+		 *
+		 * @param Array $fields_hash
+		 * @return string
+		 */
+		function buildTemplate($fields_hash)
+		{
+			if (!implode('', $fields_hash)) {
+				return '';
+			}
+
+			$ret = array_key_exists('Headers', $fields_hash) ? $fields_hash['Headers'] : '';
+			if ($ret) {
+				$ret .= "\n";
+			}
+
+			$ret = $this->_removeTrailingCRLF($ret);
+			$ret .= 'Subject: ' . $fields_hash['Subject'] . "\n\n";
+			$ret .= $fields_hash['Body'];
+
+			return $ret;
+		}
+
+		/**
+		 * Remove trailing CR/LF chars from string
+		 *
+		 * @param string $string
+		 * @return string
+		 */
+		function _removeTrailingCRLF($string)
+		{
+			return preg_replace('/(\n|\r)+/',"\\1",$string);
+		}
 	}
\ No newline at end of file