Index: email_message_helper.php
===================================================================
--- email_message_helper.php	(revision 13268)
+++ email_message_helper.php	(working copy)
@@ -12,9 +12,9 @@
 		{
 			$ret = Array ('Subject' => '', 'Headers' => '', 'Body' => '');
 			$headers = Array();
-			$lines = explode("\n", $text);
+			$lines = explode("\n", $text); // "\n" is lost in process
 
-			foreach ($lines as $line) {
+			foreach ($lines as $line_id => $line) {
 				if (strlen(trim($line)) == 0 || ($line == '.')) {
 					break;
 				}
@@ -30,12 +30,10 @@
 
 			$ret['Headers'] = implode("\n", $headers);
 
-			$message_body = '';
-			while ((list($line_id, $line) = each($lines))) {
-				$message_body .= $line;
-			}
+			$lines = array_slice($lines, $line_id + 1);
 
-			$ret['Body'] = $message_body;
+			// add "\n", that was lost before
+			$ret['Body'] = implode("\n", $lines);
 
 			return $ret;
 		}
Index: language_import_helper.php
===================================================================
--- language_import_helper.php	(revision 13268)
+++ language_import_helper.php	(working copy)
@@ -169,7 +169,7 @@
 			// copy data from temp tables to live
 			foreach ($this->_languages as $language_id) {
 				$this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation'));
-				$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'l%s_Body'));
+				$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'MessageType', 'l%s_Body'));
 			}
 
 			$this->_initImportTables(true);