Index: branches/5.3.x/core/install/english.lang
===================================================================
diff -u -r16124 -r16319
--- branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 16124)
+++ branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 16319)
@@ -1882,16 +1882,16 @@
 				<HTMLBODY>WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSB3aWxsIHNvb24gZXhwaXJlLg==</HTMLBODY>
 			</EVENT>
 			<EVENT Event="USER.MEMBERSHIP.EXPIRATION.NOTICE" Type="1">
-				<SUBJECT>TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOnVfRmllbGQgbmFtZT0iVXNlcm5hbWUiLz4iIFNlbnQ=</SUBJECT>
-				<HTMLBODY>VXNlciA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IG1lbWJlcnNoaXAgd2lsbCBleHBpcmUgc29vbi4=</HTMLBODY>
+				<SUBJECT>TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOkZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IiBTZW50</SUBJECT>
+				<HTMLBODY>VXNlciA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPiBtZW1iZXJzaGlwIHdpbGwgZXhwaXJlIHNvb24u</HTMLBODY>
 			</EVENT>
 			<EVENT Event="USER.MEMBERSHIP.EXPIRED" Type="0">
 				<SUBJECT>WW91ciBNZW1iZXJzaGlwIEV4cGlyZWQ=</SUBJECT>
 				<HTMLBODY>WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=</HTMLBODY>
 			</EVENT>
 			<EVENT Event="USER.MEMBERSHIP.EXPIRED" Type="1">
-				<SUBJECT>VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KQ==</SUBJECT>
-				<HTMLBODY>VXNlcidzICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KSBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=</HTMLBODY>
+				<SUBJECT>VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPik=</SUBJECT>
+				<HTMLBODY>VXNlcidzICg8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPikgbWVtYmVyc2hpcCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+IHdlYnNpdGUgaGFzIGV4cGlyZWQu</HTMLBODY>
 			</EVENT>
 			<EVENT Event="USER.NEW.PASSWORD" Type="0">
 				<SUBJECT>TmV3IHBhc3N3b3JkIGdlbmVyYXRlZA==</SUBJECT>
Index: branches/5.3.x/core/units/users/users_event_handler.php
===================================================================
diff -u -r16111 -r16319
--- branches/5.3.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 16111)
+++ branches/5.3.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 16319)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: users_event_handler.php 16319 2016-01-23 18:03:23Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1035,12 +1035,19 @@
 			$records = $this->Conn->Query($sql);
 			if ($records) {
 				$conditions = Array();
-				$send_params = Array ('PrefixSpecial' => 'u');
 
+				/** @var UsersItem $user */
+				$user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
+
 				foreach ($records as $record) {
-					$send_params['item_id'] = $record['PortalUserId'];
-					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId'], $send_params);
-					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $send_params);
+					$user->Load($record['PortalUserId']);
+
+					$this->Application->emailUser(
+						'USER.MEMBERSHIP.EXPIRATION.NOTICE',
+						$record['PortalUserId'],
+						$user->getEmailParams()
+					);
+					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $user->getEmailParams());
 					$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
 				}
 
@@ -1057,12 +1064,14 @@
 					WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')';
 			$user_ids = $this->Conn->GetCol($sql);
 			if ($user_ids) {
-				$send_params = Array ('PrefixSpecial' => 'u');
+				/** @var UsersItem $user */
+				$user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
 
 				foreach ($user_ids as $id) {
-					$send_params['item_id'] = $id;
-					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $send_params);
-					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $send_params);
+					$user->Load($id);
+
+					$this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $user->getEmailParams());
+					$this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $user->getEmailParams());
 				}
 			}
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -r16213 -r16319
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16213)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16319)
@@ -3026,3 +3026,10 @@
 UPDATE Modules
 SET ClassNamespace = 'InPortal\\Core'
 WHERE `Name` IN ('Core', 'In-Portal');
+
+UPDATE EmailTemplates
+SET
+	l1_Subject = REPLACE(l1_Subject, '<inp2:u_', '<inp2:'),
+	l1_HtmlBody = REPLACE(l1_HtmlBody, '<inp2:u_', '<inp2:'),
+	l1_PlainTextBody = REPLACE(l1_PlainTextBody, '<inp2:u_', '<inp2:')
+WHERE TemplateName LIKE 'USER.MEMBERSHIP%';