diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 4a36de6..c2ad461 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1881
\ No newline at end of file
+1887
\ No newline at end of file
diff --git a/templates/Messages.xslt b/templates/Messages.xslt
index bdc0383..c0d8a41 100644
--- a/templates/Messages.xslt
+++ b/templates/Messages.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-	<xsl:variable name="lang">en</xsl:variable>
+	<xsl:variable name="lang">ru</xsl:variable>
 
 	<xsl:template name="Messages_AllPosts"><xsl:choose>
 		<xsl:when test="$lang='ru'">Все сообщения</xsl:when>
@@ -221,6 +221,19 @@
 		<xsl:otherwise>Users of forum.local please enter your forum.local user name.</xsl:otherwise>
 	</xsl:choose></xsl:template>
 
+	<xsl:template match="user" mode="Messages_MigrationUserFound"><xsl:choose>
+		<xsl:when test="$lang='ru'">Пользователь <xsl:apply-templates select="current()" mode="userLink"/> найден в списке пользователей старого форума.</xsl:when>
+		<xsl:otherwise>User <xsl:apply-templates select="current()" mode="userLink"/> is found in the list of users of forum.local.</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_MigrationKeyInfo">
+		<xsl:param name="key"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'">Введите строку <b>(fhn:<xsl:value-of select="$key"/>)</b> (вместе со скобками) в поле биографии в своём профайле на старом форуме.</xsl:when>
+			<xsl:otherwise>Write the key <b>(fhn:<xsl:value-of select="$key"/>)</b> (including the braces) in your `biography' field on forum.local.</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="Messages_Registration"><xsl:choose>
 		<xsl:when test="$lang='ru'">Регистрация</xsl:when>
 		<xsl:otherwise>First-time registration</xsl:otherwise>
@@ -242,4 +255,85 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="Messages_AcceptanceRequired"><xsl:choose>
+		<xsl:when test="$lang='ru'">обязательно</xsl:when>
+		<xsl:otherwise>required</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_AcceptConstitution"><xsl:choose>
+		<xsl:when test="$lang='ru'">Да, я согласен/согласна/согласно с тем, что на этом форуме действует <a href="/q/constitution/" style="text-decoration:underline">описанная по этой ссылке конституция</a>.</xsl:when>
+		<xsl:otherwise>I accept the <a href="/q/constitution">constitution described on this link</a>.</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_AcceptPostsVisibility"><xsl:choose>
+		<xsl:when test="$lang='ru'">Да, я согласен/согласна/согласно с тем, чтобы мои сообщения, размещённые на этом форуме, были доступны публично.</xsl:when>
+		<xsl:otherwise>I accept that all the messages hosted on this resource are to be available publicly.</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_AcceptLaws"><xsl:choose>
+		<xsl:when test="$lang='ru'">Да, я обязуюсь соблюдать законы Российской Федерации и Федеративной Республики Германия в общении на этом форуме.</xsl:when>
+		<xsl:otherwise>I swear not to violate state laws of the Russian Federation and of the Federal Republic of Germany.</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_NewPoll"><xsl:choose>
+		<xsl:when test="$lang='ru'">Создание нового опроса</xsl:when>
+		<xsl:otherwise>Create new poll</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template match="user" mode="Messages_CurrentUser"><xsl:choose>
+		<xsl:when test="$lang='ru'">Пользователь: <xsl:apply-templates select="current()" mode="userLink"/></xsl:when>
+		<xsl:otherwise>User: <xsl:apply-templates select="current()" mode="userLink"/></xsl:otherwise>
+	</xsl:choose></xsl:template>
+	
+	<xsl:template match="user" mode="Messages_Receiver"><xsl:choose>
+		<xsl:when test="$lang='ru'">Получатель: <xsl:apply-templates select="current()" mode="userLink"/></xsl:when>
+		<xsl:otherwise>Receiver: <xsl:apply-templates select="current()" mode="userLink"/></xsl:otherwise>
+	</xsl:choose></xsl:template>
+	
+	<xsl:template match="user" mode="Messages_Author"><xsl:choose>
+		<xsl:when test="$lang='ru'">Автор: <xsl:apply-templates select="current()" mode="userLink"/></xsl:when>
+		<xsl:otherwise>Author: <xsl:apply-templates select="current()" mode="userLink"/></xsl:otherwise>
+	</xsl:choose></xsl:template>
+	
+	<xsl:template name="Messages_Title"><xsl:choose>
+		<xsl:when test="$lang='ru'">Заголовок</xsl:when>
+		<xsl:otherwise>Title</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_Layer"><xsl:choose>
+		<xsl:when test="$lang='ru'">Слой</xsl:when>
+		<xsl:otherwise>Layer</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_PollIsDetailed"><xsl:choose>
+		<xsl:when test="$lang='ru'">Показывать имена проголосовавших</xsl:when>
+		<xsl:otherwise>Show users voted</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_PollIsMultiOption"><xsl:choose>
+		<xsl:when test="$lang='ru'">Разрешить выбор нескольких вариантов</xsl:when>
+		<xsl:otherwise>Allow multiple chooses</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
+	<xsl:template name="Messages_NewThread">
+		<xsl:param name="boardName"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'">Создать новую тему в <xsl:value-of select="$boardName"/></xsl:when>
+			<xsl:otherwise>Create new thread in <xsl:value-of select="$boardName"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template name="Messages_NewPM">
+		<xsl:param name="userName"/>
+		<xsl:choose>
+			<xsl:when test="$lang='ru'">Написать личное сообщение<xsl:if test="$userName!=''"> пользователю <xsl:value-of select="$userName"/></xsl:if></xsl:when>
+			<xsl:otherwise>Send a private message<xsl:if test="$userName!=''"> to user <xsl:value-of select="$userName"/></xsl:if></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template name="Messages_OriginalMessage"><xsl:choose>
+		<xsl:when test="$lang='ru'">Исходное сообщение</xsl:when>
+		<xsl:otherwise>Original message</xsl:otherwise>
+	</xsl:choose></xsl:template>
+
 </xsl:stylesheet>
diff --git a/templates/Modern/AllPosts.xslt b/templates/Modern/AllPosts.xslt
index f1fdde6..b645b99 100644
--- a/templates/Modern/AllPosts.xslt
+++ b/templates/Modern/AllPosts.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\PostInfo.xslt"/>
diff --git a/templates/Modern/AllThreads.xslt b/templates/Modern/AllThreads.xslt
index c6d5bb8..b524190 100644
--- a/templates/Modern/AllThreads.xslt
+++ b/templates/Modern/AllThreads.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\ThreadInfo.xslt"/>
diff --git a/templates/Modern/AvatarsSettings.xslt b/templates/Modern/AvatarsSettings.xslt
index 82230da..6285e6f 100644
--- a/templates/Modern/AvatarsSettings.xslt
+++ b/templates/Modern/AvatarsSettings.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">
diff --git a/templates/Modern/Board.xslt b/templates/Modern/Board.xslt
index 6c25f4e..730a9f0 100644
--- a/templates/Modern/Board.xslt
+++ b/templates/Modern/Board.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\BoardInfo.xslt"/>
diff --git a/templates/Modern/BoardAsThread.xslt b/templates/Modern/BoardAsThread.xslt
index 068cfbc..edfc0b9 100644
--- a/templates/Modern/BoardAsThread.xslt
+++ b/templates/Modern/BoardAsThread.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\PostInfo.xslt"/>
diff --git a/templates/Modern/Boards.xslt b/templates/Modern/Boards.xslt
index cc73258..1c731fc 100644
--- a/templates/Modern/Boards.xslt
+++ b/templates/Modern/Boards.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\BoardInfo.xslt"/>
diff --git a/templates/Modern/Conversation.xslt b/templates/Modern/Conversation.xslt
index e6b5f75..7cae94d 100644
--- a/templates/Modern/Conversation.xslt
+++ b/templates/Modern/Conversation.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\PMInfo.xslt"/>
diff --git a/templates/Modern/Conversations.xslt b/templates/Modern/Conversations.xslt
index f8ba169..d0b9bfd 100644
--- a/templates/Modern/Conversations.xslt
+++ b/templates/Modern/Conversations.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\ConversationInfo.xslt"/>
diff --git a/templates/Modern/Exception.xslt b/templates/Modern/Exception.xslt
index 0fd5083..a59e3d5 100644
--- a/templates/Modern/Exception.xslt
+++ b/templates/Modern/Exception.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">
diff --git a/templates/Modern/LocalNetworks.xslt b/templates/Modern/LocalNetworks.xslt
index cbc28d4..08bda0b 100644
--- a/templates/Modern/LocalNetworks.xslt
+++ b/templates/Modern/LocalNetworks.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">
diff --git a/templates/Modern/Login.xslt b/templates/Modern/Login.xslt
index 7d5808c..fbd3302 100644
--- a/templates/Modern/Login.xslt
+++ b/templates/Modern/Login.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">
@@ -125,20 +125,20 @@
 										<input type="text" name="registrationEmail" class="formboxes" />
 										<br/>
 										<input type="checkbox" name="constitution" value="constitution" id="constitution"/>
-										<label for="constitution"> ��, � ��������/��������/�������� � ���, ��� �� ���� ������ ��������� </label>
-										<a href="/q/constitution/" style="text-decoration:underline">��������� �� ���� ������ �����������</a>
-										<xsl:text>.</xsl:text>
-										<i> (�����������)</i>
+										<label for="constitution"> <xsl:call-template name="Messages_AcceptConstitution"/></label>
+										<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 										<br/>
 										<input type="checkbox" name="showPostsToAll" value="showPostsToAll" id="showPostsToAll"/>
-										<label for="showPostsToAll"> ��, � ��������/��������/�������� � ���, ����� ��� ���������, ����������� �� ���� ������, ���� �������� ��������.</label>
-										<i> (�����������)</i>
+										<label for="showPostsToAll"> <xsl:call-template name="Messages_AcceptPostsVisibility"/></label>
+										<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 										<br/>
 										<input type="checkbox" name="law" value="law" id="law"/>
-										<label for="law"> ��, � �������� ��������� ������ ���������� ��������� � ������������ ���������� �������� � ������� �� ���� ������.</label>
-										<i> (�����������)</i>
+										<label for="law"> <xsl:call-template name="Messages_AcceptLaws"/></label>
+										<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 										<br/>
-										<input type="submit" name="buttlogin" value="������������������!" class="buttons" /> 
+										<input type="submit" name="buttlogin" class="buttons">
+											<xsl:attribute name="value"><xsl:call-template name="Messages_Registration"/></xsl:attribute>
+										</input>
 									</form>
 								</td> 
 							</tr> 
diff --git a/templates/Modern/MigrateAccount.xslt b/templates/Modern/MigrateAccount.xslt
index 5cd6628..04a00a6 100644
--- a/templates/Modern/MigrateAccount.xslt
+++ b/templates/Modern/MigrateAccount.xslt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">��������</xsl:template>
@@ -17,13 +17,11 @@
 						</tr>
 						<tr class="darktable"> 
 							<td>
-								<xsl:text>������������ </xsl:text>
-								<xsl:apply-templates select="migrationInfo/account/user" mode="userLink"/>
-								<xsl:text> ������ � ������ ������������� ������� ������.</xsl:text>
+								<xsl:apply-templates mode="Messages_MigrationUserFound" select="migrationInfo/account/user"/>
 								<br/>
-								<xsl:text>������� ������ </xsl:text>
-								<b>(fhn:<xsl:value-of select="migrationInfo/key"/>)</b>
-								<xsl:text> (������ �� ��������) � ���� ��������� � ���� �������� �� ������ ������.</xsl:text>
+								<xsl:call-template name="Messages_MigrationKeyInfo">
+									<xsl:with-param name="key"><xsl:value-of select="migrationInfo/key"/></xsl:with-param>
+								</xsl:call-template>
 							</td> 
 						</tr> 
 						<tr> 
@@ -35,28 +33,32 @@
 									<input type="hidden" name="check">
 										<xsl:attribute name="value"><xsl:value-of select="migrationInfo/check"/></xsl:attribute>
 									</input>
-									<xsl:text>����� ������</xsl:text><br /> 
-									<input type="password" name="password" class="formboxes" /><br/>
-									<xsl:text>��������� ������</xsl:text><br/> 
+									<xsl:call-template name="Messages_NewPassword"/>
+									<br/>
+									<input type="password" name="password" class="formboxes"/>
+									<br/>
+									<xsl:call-template name="Messages_NewPasswordRepeat"/>
+									<br/>
 									<input type="password" name="password2" class="formboxes" /><br/>
-									<xsl:text>e-mail ��� �������������� ������ (�������������)</xsl:text><br/>
+									<xsl:call-template name="Messages_AccountEmail"/>
+									<br/>
 									<input type="text" name="registrationEmail" class="formboxes" />
 									<br/>
 									<input type="checkbox" name="constitution" value="constitution" id="constitution"/>
-									<label for="constitution"> ��, � ��������/��������/�������� � ���, ��� �� ���� ������ ��������� </label>
-									<a href="/q/constitution/" style="text-decoration:underline">��������� �� ���� ������ �����������</a>
-									<xsl:text>.</xsl:text>
-									<i> (�����������)</i>
+									<label for="constitution"> <xsl:call-template name="Messages_AcceptConstitution"/></label>
+									<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 									<br/>
 									<input type="checkbox" name="showPostsToAll" value="showPostsToAll" id="showPostsToAll"/>
-									<label for="showPostsToAll"> ��, � ��������/��������/�������� � ���, ����� ��� ���������, ����������� �� ���� ������ ��� �� �����.������ (��������.��), ���� �������� ��������.</label>
-									<i> (�����������)</i>
+									<label for="showPostsToAll"> <xsl:call-template name="Messages_AcceptPostsVisibility"/></label>
+									<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 									<br/>
 									<input type="checkbox" name="law" value="law" id="law"/>
-									<label for="law"> ��, � �������� ��������� ������ ���������� ��������� � ������������ ���������� �������� � ������� �� ���� ������.</label>
-									<i> (�����������)</i>
+									<label for="law"> <xsl:call-template name="Messages_AcceptLaws"/></label>
+									<i> (<xsl:call-template name="Messages_AcceptanceRequired"/>)</i>
 									<br/>
-									<input type="submit" name="buttlogin" value="�����������!" class="buttons" /> 
+									<input type="submit" name="buttlogin" class="buttons">
+										<xsl:call-template name="Messages_Migration"/>
+									</input>
 								</form>
 								<h3 style="color:red">
 									<xsl:text>���� � ��� ���-�� �� ���������� - ���������� </xsl:text>
diff --git a/templates/Modern/NewPoll.xslt b/templates/Modern/NewPoll.xslt
index 3f39287..baeab96 100644
--- a/templates/Modern/NewPoll.xslt
+++ b/templates/Modern/NewPoll.xslt
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:template name="specificTitle">
-		<xsl:text>����� ������</xsl:text>
+		<xsl:call-template name="Messages_NewPoll"/>
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
@@ -12,22 +12,17 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>�������� ������ ������</xsl:text>
+								<xsl:call-template name="Messages_NewPoll"/>
 							</td> 
 						</tr>
-						<tr class="darktable"> 
-							<td> 
-								<xsl:text>��������� ����������� ���� ����� ��� �������� ��������� � �����. HTML ��������. UBBCode �������, � �� ������ ������������ UBBCode � ����� ����������. ��������� ��������� ���������, � �� ������ ������� ����� �������������������� ���.</xsl:text>
-							</td> 
-						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/NewPoll/" name="replier">
-									<xsl:text>������������: </xsl:text>
-									<xsl:value-of select="session/user/name"/>
+									<xsl:apply-templates select="session/user" mode="Messages_User"/>
 									<br/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>:</xsl:text>
 									<br/>
 									<textarea cols="100" tabindex="2" rows="3" class="formboxes" name="title">
 										<xsl:text> </xsl:text>
@@ -35,10 +30,10 @@
 									<br/>
 									<br/>
 									<input type="checkbox" name="isDetailed" value="isDetailed" id="isDetailed"/>
-									<label for="isDetailed"> ���������� ����� ���������������</label>
+									<label for="isDetailed"> <xsl:call-template name="Messages_PollIsDetailed"/></label>
 									<br/>
 									<input type="checkbox" name="isMultiOption" value="isMultiOption" id="isMultiOption"/>
-									<label for="isMultiOption"> ��������� ����� ���������� ���������</label>
+									<label for="isMultiOption"> <xsl:call-template name="Messages_PollIsMultioption"/></label>
 									<br/>
 									<br/>
 									<xsl:text>������� 1: </xsl:text>
@@ -181,7 +176,9 @@
 									</textarea>
 									<br/>
 									<br/>
-									<input type="submit" tabindex="3" name="textcont" taborder="2" value="����������" class="buttons"/>
+									<input type="submit" tabindex="3" name="textcont" taborder="2" class="buttons">
+										<xsl:call-template name="Messages_NewPoll"/>
+									</input>
 								</form>
 							</td>
 						</tr>
diff --git a/templates/Modern/NewThread.xslt b/templates/Modern/NewThread.xslt
index d2a5e16..4dc86d6 100644
--- a/templates/Modern/NewThread.xslt
+++ b/templates/Modern/NewThread.xslt
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\TextEditor.xslt"/>
 	<xsl:template name="specificTitle">
-		<xsl:text>����� ���� - </xsl:text>
-		<xsl:value-of select="board/name"/>
+		<xsl:call-template name="Messages_NewThread">
+			<xsl:with-param name="boardName" select="board/name"/>
+		</xsl:call-template>
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
@@ -14,32 +15,28 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>�������� ����� ���� - ����� (</xsl:text>
-								<xsl:value-of select="board/name"/>
-								<xsl:text>)</xsl:text>
+								<xsl:call-template name="Messages_NewThread">
+									<xsl:with-param name="boardName" select="board/name"/>
+								</xsl:call-template>
 							</td> 
 						</tr>
-						<tr class="darktable"> 
-							<td> 
-								<xsl:text>��������� ����������� ���� ����� ��� �������� ��������� � �����. HTML ��������. UBBCode �������, � �� ������ ������������ UBBCode � ����� ����������. ��������� ��������� ���������, � �� ������ ������� ����� �������������������� ���.</xsl:text>
-							</td> 
-						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/NewThread/" name="replier">
 									<input type="hidden" name="board">
 										<xsl:attribute name="value"><xsl:value-of select="board/id"/></xsl:attribute>
 									</input>
-									<xsl:text>������������: </xsl:text>
-									<xsl:value-of select="session/user/name"/>
+									<xsl:apply-templates select="session/user" mode="Messages_CurrentUser"/>
 									<br/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>:</xsl:text>
 									<br/>
 									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60">
 										<xsl:attribute name="value"><xsl:value-of select="newTitle"/></xsl:attribute>
 									</input>
-									<span class="small">���� ���������:</span> 
+									<xsl:call-template name="Messages_Layer"/>
+									<xsl:text>:</xsl:text>
 									<select class="formboxes" name="layerId">
 										<xsl:apply-templates select="layers">
 											<!--xsl:with-param name="defaultLayerId"><xsl:value-of select="post/layerId"/></xsl:with-param-->
@@ -48,7 +45,13 @@
 									<br/>
 									<br/>
 									<xsl:call-template name="textEditor"/>
-									<input type="submit" tabindex="3" name="textcont" taborder="2" value="����������" class="buttons"/>
+									<input type="submit" tabindex="3" name="textcont" taborder="2" class="buttons">
+										<xsl:attribute name="value">
+											<xsl:call-template name="Messages_NewThread">
+												<xsl:with-param name="boardName" select="board/name"/>
+											</xsl:call-template>
+										</xsl:attribute>
+									</input>
 								</form>
 							</td>
 						</tr>
diff --git a/templates/Modern/PMReply.xslt b/templates/Modern/PMReply.xslt
index 4f18d90..e7493ce 100644
--- a/templates/Modern/PMReply.xslt
+++ b/templates/Modern/PMReply.xslt
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\TextEditor.xslt"/>
 	<xsl:template name="specificTitle">
-		<xsl:text>����� �� ������ ��������� - </xsl:text>
-		<xsl:value-of select="message/interlocutor/account/user/name"/>
+		<xsl:call-template name="Messages_NewPM">
+			<xsl:with-param name="userName" select="message/interlocutor/account/user/name"/>
+		</xsl:call-template>
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
@@ -14,27 +15,24 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>����� �� ������ ��������� (</xsl:text>
-								<xsl:value-of select="message/interlocutor/account/user/name"/>
-								<xsl:text>)</xsl:text>
+								<xsl:call-template name="Messages_NewPM">
+									<xsl:with-param name="userName" select="message/interlocutor/account/user/name"/>
+								</xsl:call-template>
 							</td> 
 						</tr>
-						<tr class="darktable"> 
-							<td> 
-								<xsl:text>��������� ����������� ���� ����� ��� �������� ������� ���������. HTML ��������. UBBCode �������, � �� ������ ������������ UBBCode � ����� ����������. ��������� ��������� ���������, � �� ������ ������� ����� �������������������� ���.</xsl:text>
-							</td> 
-						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/SendPM/" name="replier">
 									<input type="hidden" name="receiverId">
 										<xsl:attribute name="value"><xsl:value-of select="message/interlocutor/account/id"/></xsl:attribute>
 									</input>
-									<xsl:text>������������: </xsl:text>
-									<xsl:value-of select="session/user/name"/>
+									<xsl:apply-templates select="session/user" mode="Messages_CurrentUser"/>
 									<br/>
+									<xsl:apply-templates select="message/interlocutor/account/user" mode="Messages_Receiver"/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<br/>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>:</xsl:text>
 									<br/>
 									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60">
 										<xsl:choose>
@@ -59,7 +57,13 @@
 </xsl:text>
 										</xsl:with-param>
 									</xsl:call-template>
-									<input type="submit" tabindex="3" name="textcont" taborder="2" value="����������" class="buttons"/>
+									<input type="submit" tabindex="3" name="textcont" taborder="2" class="buttons">
+										<xsl:attribute name="value">
+											<xsl:call-template name="Messages_NewPM">
+												<xsl:with-param name="userName" select="message/interlocutor/account/user/name"/>
+											</xsl:call-template>
+										</xsl:attribute>
+									</input>
 								</form>
 							</td>
 						</tr>
@@ -76,16 +80,16 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>����� �� ���������</xsl:text>
+								<xsl:call-template name="Messages_OriginalMessage"/>
 							</td> 
 						</tr>
 						<tr class="darktable"> 
 							<td>
 								<b>
-									<xsl:text>�����: </xsl:text>
-									<xsl:value-of select="message/poster/account/user/name"/>
+									<xsl:apply-templates select="message/interlocutor/account/user" mode="Messages_Author"/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>: </xsl:text>
 									<xsl:value-of select="message/title"/>
 								</b>
 							</td> 
diff --git a/templates/Modern/PMReplyToPost.xslt b/templates/Modern/PMReplyToPost.xslt
index 70eab00..bf69188 100644
--- a/templates/Modern/PMReplyToPost.xslt
+++ b/templates/Modern/PMReplyToPost.xslt
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="Windows-1251"?>
+<?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
 	<xsl:import href="elems\Main.xslt"/>
 	<xsl:import href="elems\TextEditor.xslt"/>
 	<xsl:template name="specificTitle">
-		<xsl:text>������ ����� �� ��������� - </xsl:text>
-		<xsl:value-of select="post/title"/>
+		<xsl:call-template name="Messages_NewPM">
+			<xsl:with-param name="userName" select="post/poster/user/name"/>
+		</xsl:call-template>
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="specific">
@@ -14,30 +15,24 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>����� �� ��������� (</xsl:text>
-								<xsl:value-of select="board/name"/>
-								<xsl:text>)</xsl:text>
+								<xsl:call-template name="Messages_NewPM">
+									<xsl:with-param name="userName" select="message/interlocutor/account/user/name"/>
+								</xsl:call-template>
 							</td> 
 						</tr>
-						<tr class="darktable"> 
-							<td> 
-								<xsl:text>��������� ����������� ���� ����� ��� �������� ������� ���������.</xsl:text>
-							</td> 
-						</tr> 
 						<tr> 
 							<td class="lighttable"> 
 								<form method="post" action="/do/SendPM/" name="replier">
 									<input type="hidden" name="receiverId">
 										<xsl:attribute name="value"><xsl:value-of select="receiver/account/id"/></xsl:attribute>
 									</input>
-									<xsl:text>������������: </xsl:text>
-									<xsl:value-of select="session/user/name"/>
+									<xsl:apply-templates select="session/user" mode="Messages_CurrentUser"/>
 									<br/>
-									<xsl:text>����������: </xsl:text>
-									<xsl:value-of select="post/poster/user/name"/>
+									<xsl:apply-templates select="post/poster/user" mode="Messages_Receiver"/>
 									<br/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>:</xsl:text>
 									<br/>
 									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60">
 										<xsl:choose>
@@ -64,7 +59,13 @@
 											</xsl:if>
 										</xsl:with-param>
 									</xsl:call-template>
-									<input type="submit" tabindex="3" name="textcont" taborder="2" value="����������" class="buttons"/>
+									<input type="submit" tabindex="3" name="textcont" taborder="2" class="buttons">
+										<xsl:attribute name="value">
+											<xsl:call-template name="Messages_NewPM">
+												<xsl:with-param name="userName" select="post/poster/user/name"/>
+											</xsl:call-template>
+										</xsl:attribute>
+									</input>
 								</form>
 							</td>
 						</tr>
@@ -81,16 +82,16 @@
 					<table cellpadding="3" cellspacing="1" width="100%" class="tableborders">
 						<tr>
 							<td class="tdheader">
-								<xsl:text>����� �� ���������</xsl:text>
+								<xsl:call-template name="Messages_OriginalMessage"/>
 							</td> 
 						</tr>
 						<tr class="darktable"> 
 							<td>
 								<b>
-									<xsl:text>�����: </xsl:text>
-									<xsl:value-of select="post/poster/user/name"/>
+									<xsl:apply-templates select="post/poster/user" mode="Messages_Author"/>
 									<br/>
-									<xsl:text>����: </xsl:text>
+									<xsl:call-template name="Messages_Title"/>
+									<xsl:text>: </xsl:text>
 									<xsl:value-of select="post/title"/>
 								</b>
 							</td>