Index: install/upgrades.php
===================================================================
--- install/upgrades.php	(revision 15449)
+++ install/upgrades.php	(working copy)
@@ -2122,12 +2122,15 @@
 				return;
 			}
 
+			$primary_language_id = $this->Application->GetDefaultLanguageId();
 			$table_name = $this->Application->getUnitOption('lang', 'TableName');
 
 			foreach ($languages as $language_id) {
+				$is_primary = $language_id == $primary_language_id;
+
 				$fields_hash = Array (
-					'HtmlEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_HtmlBody']),
-					'TextEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_PlainTextBody']),
+					'HtmlEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_HtmlBody'], $is_primary),
+					'TextEmailTemplate' => $this->_appendEmailDesignBody($footer_data['l' . $language_id . '_PlainTextBody'], $is_primary),
 				);
 
 				$this->Conn->doUpdate($fields_hash, $table_name, 'LanguageId = ' . $language_id);
@@ -2142,13 +2145,14 @@
 		 * Adds "$body" to given string
 		 *
 		 * @param string $string
+		 * @param bool $is_primary for primary language
 		 * @return string
 		 * @access private
 		 */
-		private function _appendEmailDesignBody($string)
+		private function _appendEmailDesignBody($string, $is_primary)
 		{
 			if ( !$string ) {
-				return $string;
+				return $is_primary ? '$body' : $string;
 			}
 
 			return '$body' . "\n" . str_replace(Array ("\r\n", "\r"), "\n", $string);