Index: branches/RC/core/install/upgrades.php
===================================================================
diff -u -r11201 -r11237
--- branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11201)
+++ branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11237)
@@ -211,6 +211,32 @@
 		 */
 		function Upgrade_4_3_9($mode)
 		{
+			// 1. find In-Portal old <inp: tags
+			$sql = 'SELECT EmailMessageId
+						FROM '.TABLE_PREFIX.'EmailMessage
+						WHERE Template LIKE \'%<inp:%\'';
+			$event_ids = implode(',', $this->Conn->GetCol($sql));
+
+			// 2. replace In-Portal old <inp: tags to K4 tags
+			$replacements = Array (
+				'<inp:m_category_field _Field="Name" _StripHTML="1"/>' => '<inp2:c_Field name="Name"/>',
+				'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
+				'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
+				'<inp:touser _Field="' => '<inp2:u_Field name="',
+				'<inp:m_page_title' => '<inp2:m_BaseUrl',
+				'<inp:m_theme_url _page="current"' => '<inp2:m_BaseUrl',
+				'<inp:topic _field="text"' => '<inp2:bb-post_Field name="PostingText"',
+				'<inp:topic _field="link" _Template="inbulletin/post_list"' => '<inp2:bb_TopicLink template="__default__"',
+				'' => '',
+			);
+
+			foreach ($replacements as $old_tag => $new_tag) {
+				$sql = 'UPDATE '.TABLE_PREFIX.'EmailMessage
+							SET Template = REPLACE(Template, '.$this->Conn->qstr($old_tag).', '.$this->Conn->qstr($new_tag).')
+							WHERE EventId IN ('.$event_ids.')';
+				$this->Conn->Query($sql);
+			}
+
 			if ($mode == 'after') {
 				$this->_insertInPortalData();
 				$this->_removeDuplicatePhrases();