Index: branches/1.2.x/_install/english.lang
===================================================================
diff -u -N -r14967 -r14972
--- branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 14967)
+++ branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 14972)
@@ -1,5 +1,5 @@
-<LANGUAGES>
-	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="4">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<PHRASES>
 			<PHRASE Label="lu_add" Module="Core" Type="0">QWRk</PHRASE>
 			<PHRASE Label="lu_added" Module="Core" Type="0">QWRkZWQ=</PHRASE>
@@ -106,8 +106,12 @@
 			<PHRASE Label="lu_error_alreadyadded" Module="Core" Type="0">Q2F0ZWdvcnkgYWxyZWFkeSBhZGRlZCE=</PHRASE>
 			<PHRASE Label="lu_error_AlreadyCommented" Module="Core" Type="0">QWxyZWFkeSBjb21tZW50ZWQ=</PHRASE>
 			<PHRASE Label="lu_error_categorylimitreached" Module="Core" Type="0">Q2F0ZWdvcnkgbGltaXQgcmVhY2hlZCE=</PHRASE>
+			<PHRASE Label="lu_error_EmailRestoreCodeNotValid" Module="Core" Type="0">UmVzdG9yZSBjb2RlIG5vdCB2YWxpZA==</PHRASE>
+			<PHRASE Label="lu_error_EmailRestoreIsNotPossible" Module="Core" Type="0">RS1tYWlsIHJlc3RvcmUgaXMgbm90IHBvc3NpYmxl</PHRASE>
 			<PHRASE Label="lu_error_Required" Module="Core" Type="0">UmVxdWlyZWQ=</PHRASE>
 			<PHRASE Label="lu_error_UserNotFound" Module="Core" Type="0">VXNlciBOb3QgRm91bmQ=</PHRASE>
+			<PHRASE Label="lu_error_VerificationCodeExpired" Module="Core" Type="0">VmVyaWZpY2F0aW9uIGNvZGUgaGFzIGV4cGlyZWQ=</PHRASE>
+			<PHRASE Label="lu_error_VerificationCodeNotValid" Module="Core" Type="0">VmVyaWZpY2F0aW9uIGNvZGUgaXMgbm90IHZhbGlk</PHRASE>
 			<PHRASE Label="lu_favorite" Module="Core" Type="0">RmF2b3JpdGU=</PHRASE>
 			<PHRASE Label="lu_ferror_forgotpw_nodata" Module="Core" Type="0">WW91IG11c3QgZW50ZXIgYSBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIHRvIHJldHJpdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9u</PHRASE>
 			<PHRASE Label="lu_ferror_reset_denied" Module="Core" Type="0">Tm90IHJlc2V0</PHRASE>
@@ -306,6 +310,8 @@
 			<PHRASE Label="lu_text_SuggestCategoryConfirm" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWdnZXN0aW5nIHlvdXIgY2F0ZWdvcnku</PHRASE>
 			<PHRASE Label="lu_text_SuggestCategoryPendingConfirm" Module="Core" Type="0">U3VnZ2VzdGVkIGNhdGVnb3J5IGlzIHBlbmRpbmcgZm9yIEFkbWluaXN0cmF0aXZlIGFwcHJvdmFsIA==</PHRASE>
 			<PHRASE Label="lu_text_ThankYou" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgcmVxdWVzdC4=</PHRASE>
+			<PHRASE Label="lu_text_YourEmailIsRestored" Module="Core" Type="0">WW91ciBlLW1haWwgaXMgcmVzdG9yZWQ=</PHRASE>
+			<PHRASE Label="lu_text_YourEmailIsVerified" Module="Core" Type="0">WW91ciBlLW1haWwgaXMgdmVyaWZpZWQ=</PHRASE>
 			<PHRASE Label="lu_ThankForSubscribing" Module="Core" Type="0">VGhhbmsgeW91IGZvciBzdWJzY3JpYmluZyB0byBvdXIgbWFpbGluZyBsaXN0</PHRASE>
 			<PHRASE Label="lu_ThanksForVoting" Module="Core" Type="0">VGhhbmtzIGZvciBWb3Rpbmch</PHRASE>
 			<PHRASE Label="lu_ThisCategory" Module="Core" Type="0">Q3VycmVudCBDYXRlZ29yeQ==</PHRASE>
@@ -384,4 +390,4 @@
 			<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
 		</PHRASES>
 	</LANGUAGE>
-</LANGUAGES>
+</LANGUAGES>
\ No newline at end of file
Index: branches/1.2.x/platform/my_account/verify_email.tpl
===================================================================
diff -u -N
--- branches/1.2.x/platform/my_account/verify_email.tpl	(revision 0)
+++ branches/1.2.x/platform/my_account/verify_email.tpl	(revision 14972)
@@ -0,0 +1,62 @@
+<!--##
+<NAME>E-mail Verification</NAME>
+<DESC></DESC>
+<SECTION>My Account</SECTION>
+##-->
+
+<!--## PAGE TITLE ELEMENT ##-->
+<inp2:m_DefineElement name="page_title">
+	<inp2:st_PageInfo type="htmlhead_title"/>
+</inp2:m_DefineElement>
+<!--## //PAGE TITLE ELEMENT ##-->
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+	<div class="movable-area">
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
+		</div>
+	</div>
+</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+	<div class="movable-area">
+		<div class="movable-element">
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__page__" templates="platform/my_account/verify_email"/>
+		</div>
+		<div class="movable-element">
+			<!-- verify e-mail -->
+			<inp2:m_RenderElement design="content_box">
+				<inp2:m_Capture to_var="header">
+					<inp2:st_PageInfo type="title"/>
+				</inp2:m_Capture>
+
+				<inp2:m_if check="u_TestCodeIsValid" code_type="verify_email">
+					<inp2:u_MarkUserEmailAsVerified/>
+					<inp2:m_Phrase label="lu_text_YourEmailIsVerified"/>
+				<inp2:m_else />
+					<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
+					<br />	<br />
+					<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
+				</inp2:m_if>
+			</inp2:m_RenderElement>
+			<!-- // verify e-mail -->
+		</div>
+	</div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
Index: branches/1.2.x/platform/my_account/restore_email.tpl
===================================================================
diff -u -N
--- branches/1.2.x/platform/my_account/restore_email.tpl	(revision 0)
+++ branches/1.2.x/platform/my_account/restore_email.tpl	(revision 14972)
@@ -0,0 +1,61 @@
+<!--##
+<NAME>Restore E-mail</NAME>
+<DESC></DESC>
+<SECTION>My Account</SECTION>
+##-->
+
+<!--## PAGE TITLE ELEMENT ##-->
+<inp2:m_DefineElement name="page_title">
+	<inp2:st_PageInfo type="htmlhead_title"/>
+</inp2:m_DefineElement>
+<!--## //PAGE TITLE ELEMENT ##-->
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+	<div class="movable-area">
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
+		</div>
+		<div class="movable-element">
+			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
+		</div>
+	</div>
+</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+	<div class="movable-area">
+		<div class="movable-element">
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__page__" templates="platform/my_account/restore_email"/>
+		</div>
+		<div class="movable-element">
+			<!-- restore e-mail -->
+			<inp2:m_RenderElement design="content_box">
+				<inp2:m_Capture to_var="header">
+					<inp2:st_PageInfo type="title"/>
+				</inp2:m_Capture>
+
+				<inp2:m_if check="u_RestoreEmail" invalid_hash="lu_error_EmailRestoreCodeNotValid" restore_impossible="lu_error_EmailRestoreIsNotPossible">
+					<inp2:m_Phrase label="lu_text_YourEmailIsRestored"/>
+				<inp2:m_else />
+					<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
+					<br />	<br />
+					<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
+				</inp2:m_if>
+			</inp2:m_RenderElement>
+			<!-- // restore e-mail  -->
+		</div>
+	</div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->