diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php
index 339b0e484..64e5b2863 100644
--- a/upload/ajax/posts.php
+++ b/upload/ajax/posts.php
@@ -50,7 +50,7 @@ if (!defined('WORD_LIST_OBTAINED'))
 switch($this->request['type'])
 {
 	case 'delete';
-		if ($post['post_id'] != $post['topic_first_post_id'] && ($is_auth['auth_mod'] || ($userdata['user_id'] == $post['poster_id'] && $is_auth['auth_delete'] && $post['topic_last_post_id'] == $post['post_id'] && $post['post_time'] + 3600*3 > TIMENOW)))
+		if ($post['post_id'] != $post['topic_first_post_id'] && $is_auth['auth_delete'] && ($is_auth['auth_mod'] || ($userdata['user_id'] == $post['poster_id'] && $post['topic_last_post_id'] == $post['post_id'] && $post['post_time'] + 3600*3 > TIMENOW)))
 		{
 			if (empty($this->request['confirmed']))
 			{
@@ -62,14 +62,14 @@ switch($this->request['type'])
 		}
 		else
 		{
-			$this->ajax_die(sprintf($lang['DELETE_OWN_POSTS'], strip_tags($is_auth['auth_delete_type'])));
+			$this->ajax_die(sprintf($lang['SORRY_AUTH_DELETE'], strip_tags($is_auth['auth_delete_type'])));
 		}
 	break;
 
 	case 'reply';
-		if(bf($userdata['user_opt'], 'user_opt', 'allow_post'))
+		if (bf($userdata['user_opt'], 'user_opt', 'allow_post'))
 		{
-			$this->ajax_die($lang['RULES_REPLY_CANNOT']);
+			$this->ajax_die(strip_tags($lang['RULES_REPLY_CANNOT']));
 		}
 		elseif(!$is_auth['auth_reply'])
 		{
@@ -113,6 +113,10 @@ switch($this->request['type'])
 
 	case 'edit':
 	case 'editor':
+		if (bf($userdata['user_opt'], 'user_opt', 'allow_post_edit'))
+		{
+			$this->ajax_die($lang['POST_EDIT_CANNOT']);
+		}
 		if ($post['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'])
 		{
 			$this->ajax_die($lang['EDIT_OWN_POSTS']);
@@ -224,7 +228,7 @@ switch($this->request['type'])
 
 		if (bf($userdata['user_opt'], 'user_opt', 'allow_post'))
 		{
-			$this->ajax_die($lang['RULES_REPLY_CANNOT']);
+			$this->ajax_die(strip_tags($lang['RULES_REPLY_CANNOT']));
 		}
 		elseif (!$is_auth['auth_reply'])
 		{
diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php
index 426445279..0b192847b 100644
--- a/upload/ajax/view_torrent.php
+++ b/upload/ajax/view_torrent.php
@@ -104,7 +104,7 @@ class torrent
 				}
 				array_deep($f['path'], 'clean_tor_dirname');
 
-				$length = isset($f['length']) ? $f['length'] : 0;
+				$length = isset($f['length']) ? (int) $f['length'] : 0;
 				$subdir_count = count($f['path']) - 1;
 
 				if ($subdir_count > 0)
@@ -145,7 +145,7 @@ class torrent
 		{
 			$this->multiple = false;
 			$name = isset($info['name']) ? clean_tor_dirname($info['name']) : '';
-			$length = isset($info['length']) ? $info['length'] : 0;
+			$length = isset($info['length']) ? (int) $info['length'] : 0;
 
 			$this->files_ary['/'][] = $this->build_file_item($name, $length);
 			natsort($this->files_ary['/']);
diff --git a/upload/common.php b/upload/common.php
index 846880951..d52cea0ad 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -1,10 +1,15 @@
 <?php
 
+if (isset($_REQUEST['GLOBALS'])) die();
+
 ignore_user_abort(true);
 define('TIMESTART', utime());
 define('TIMENOW',   time());
 
-if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) die();
+if (empty($_SERVER['REMOTE_ADDR']))     $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+if (empty($_SERVER['HTTP_USER_AGENT'])) $_SERVER['HTTP_USER_AGENT'] = '';
+if (empty($_SERVER['HTTP_REFERER']))    $_SERVER['HTTP_REFERER'] = '';
+if (empty($_SERVER['SERVER_NAME']))     $_SERVER['SERVER_NAME'] = '';
 
 if (!defined('BB_ROOT')) define('BB_ROOT', './');
 if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
diff --git a/upload/config.php b/upload/config.php
index ac729576b..452fa8cb5 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -54,9 +54,9 @@ $domain_name = 'torrentpier.me';                    // Enter here your primary d
 $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name;
 
 // Increase number of revision after update
-$bb_cfg['tp_version'] = '2.6 (unstable)';
+$bb_cfg['tp_version'] = '2.6 (RC)';
 $bb_cfg['tp_release_date'] = '02-02-2014';
-$bb_cfg['tp_release_state'] = 'R580';
+$bb_cfg['tp_release_state'] = 'R581';
 
 // Database
 $charset  = 'utf8';
@@ -245,7 +245,10 @@ $bb_cfg['pm_url']      = 'privmsg.php';  #  "http://{$domain_name}/privmsg.php"
 // Language
 setlocale(LC_ALL, 'ru_RU.UTF-8');
 setlocale(LC_NUMERIC, 'C');
+
+$bb_cfg['charset']       = 'utf8';
 $bb_cfg['auto_language'] = true;
+
 if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
 {
 	if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ru')
diff --git a/upload/images/logo/logo_me.png b/upload/images/logo/logo_me.png
new file mode 100644
index 000000000..02ded8c24
Binary files /dev/null and b/upload/images/logo/logo_me.png differ
diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php
index bcf98fc6f..feff1c228 100644
--- a/upload/includes/init_bb.php
+++ b/upload/includes/init_bb.php
@@ -177,7 +177,6 @@ define('TOPIC_WATCH_UN_NOTIFIED', 0);
 define('POST_NORMAL',          0);
 define('POST_STICKY',          1);
 define('POST_ANNOUNCE',        2);
-define('POST_GLOBAL_ANNOUNCE', 3);
 
 // Search types
 define('SEARCH_TYPE_POST',     0);
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 8cf151026..0c25d53f0 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -3192,4 +3192,6 @@ $lang['SEARCH_NO_RESULTS'] = 'No users match your selected criteria. Please try
 $lang['ACCOUNT_STATUS'] = 'Account Status';
 $lang['SORT_OPTIONS'] = 'Sort options:';
 $lang['LAST_VISIT'] = 'Last Visit';
-$lang['DAY'] = 'Day';
\ No newline at end of file
+$lang['DAY'] = 'Day';
+
+$lang['POST_EDIT_CANNOT'] = 'Sorry, but you cannot edit posts';
\ No newline at end of file
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 02ab28a86..87c970077 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1827,8 +1827,8 @@ $lang['USER_LEVELS_UPDATED'] = 'Уровни и права пользовате
 // Synchronize
 $lang['SYNCHRONIZE'] = 'Синхронизировать';
 $lang['TOPICS_DATA_SYNCHRONIZED'] = 'Темы синхронизированы';
-$lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей.';
-$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы.';
+$lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей';
+$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы';
 
 // Online Userlist
 $lang['SHOW_ONLINE_USERLIST'] = 'Показать список пользователей онлайн';
@@ -3218,4 +3218,6 @@ $lang['SEARCH_NO_RESULTS'] = 'Нет пользователей, отвечаю
 $lang['ACCOUNT_STATUS'] = 'Статус учётной записи';
 $lang['SORT_OPTIONS'] = 'Поля сортировки:';
 $lang['LAST_VISIT'] = 'Последнее посещение';
-$lang['DAY'] = 'День';
\ No newline at end of file
+$lang['DAY'] = 'День';
+
+$lang['POST_EDIT_CANNOT'] = 'Извините, вы не можете редактировать сообщения';
\ No newline at end of file
diff --git a/upload/privmsg.php b/upload/privmsg.php
index 29d8fb58e..0f3987871 100644
--- a/upload/privmsg.php
+++ b/upload/privmsg.php
@@ -1117,7 +1117,7 @@ else if ( $submit || $refresh || $mode != '' )
 					'NAME_FROM'   => $userdata['username'],
 					'MSG_SUBJECT' => html_entity_decode($privmsg_subject),
 					'SITENAME'    => $bb_cfg['sitename'],
-					'U_INBOX'     => make_url(PM_URL ."?folder=inbox$pm&mode=read&p=". $privmsg_sent_id),
+					'U_INBOX'     => make_url(PM_URL . "?folder=inbox&mode=read&p=". $privmsg_sent_id),
 				));
 
 				$emailer->send();
diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl
index 4c830b95f..0d17296d6 100644
--- a/upload/templates/admin/index.tpl
+++ b/upload/templates/admin/index.tpl
@@ -84,21 +84,21 @@ ajax.callback.manage_user = function(data) {
 		<td>
 			<a href="#" id="datastore" onclick="ajax.manage_user('clear_datastore'); return false;">{L_DATASTORE}</a>,&nbsp;
 			<a href="#" id="cache" onclick="ajax.manage_user('clear_cache'); return false;">{L_ALL_CACHE}</a>,&nbsp;
-			<a href="#" id="template_cache" onclick="ajax.manage_user('clear_template_cache'); return false;">{L_TEMPLATES}</a>&nbsp;
+			<a href="#" id="template_cache" onclick="ajax.manage_user('clear_template_cache'); return false;">{L_TEMPLATES}</a>
 		</td>
 	</tr>
 	<tr>
 		<td><b>{L_UPDATE}:</b></td>
 		<td>
-			<a href="{U_UPDATE_USER_LEVEL}">{L_USER_LEVELS}</a>,&nbsp;
-			<!-- IF $bb_cfg['search_engine_type'] == "sphinx" --><a href="#" id="indexer" onclick="ajax.manage_user('indexer'); return false;">{L_INDEXER}</a><!-- ENDIF -->
+			<a href="{U_UPDATE_USER_LEVEL}">{L_USER_LEVELS}</a>
+			<!-- IF $bb_cfg['search_engine_type'] == "sphinx" -->,&nbsp;<a href="#" id="indexer" onclick="ajax.manage_user('indexer'); return false;">{L_INDEXER}</a><!-- ENDIF -->
 		</td>
 	</tr>
 	<tr>
 		<td><b>{L_SYNCHRONIZE}:</b></td>
 		<td>
 			<a href="{U_SYNC_TOPICS}">{L_TOPICS}</a>,&nbsp;
-			<a href="{U_SYNC_USER_POSTS}">{L_USER_POSTS_COUNT}</a>&nbsp;
+			<a href="{U_SYNC_USER_POSTS}">{L_USER_POSTS_COUNT}</a>
 		</td>
 	</tr>
 	<tr>
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index a4636b8b2..34ae8f740 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -126,13 +126,12 @@ function initSpoilers(context)
 }
 function initExternalLinks(context)
 {
-  	var context = context || 'body';
-  	if (ExternalLinks_InNewWindow) {
-  		$("a.postLink:not([href*='"+ window.location.hostname +"/'])", context).attr({ target: '_blank' });
-  		//$("a.postLink:not([@href*='"+ window.location.hostname +"/'])", context).replaceWith('<span style="color: red;">{L_LINKS_ARE_FORBIDDEN}</span>');
-  	}
+	var context = context || 'body';
+	if (ExternalLinks_InNewWindow) {
+		$("a.postLink:not([href*='"+ window.location.hostname +"/'])", context).attr({ target: '_blank' });
+	}
 }
-function fixPostImage ($img)
+function fixPostImage($img)
 {
 	var banned_image_hosts = /imagebanana|hidebehind/i;  // imageshack
 	var src = $img[0].src;
@@ -171,7 +170,7 @@ function initMedia(context)
 	}
 }
 $(document).ready(function(){
-  	$('div.post_wrap, div.signature').each(function(){ initPostBBCode( $(this) ) });
+	$('div.post_wrap, div.signature').each(function(){ initPostBBCode( $(this) ) });
 });
 </script>
 <!-- ENDIF / INCLUDE_BBCODE_JS -->
@@ -185,32 +184,32 @@ var LOGGED_IN     = {LOGGED_IN};
 var InfoWinParams = 'HEIGHT=510,resizable=yes,WIDTH=780';
 
 var user = {
-  	opt_js: {USER_OPTIONS_JS},
+	opt_js: {USER_OPTIONS_JS},
 
-  	set: function(opt, val, days, reload) {
-  		this.opt_js[opt] = val;
-  		setCookie('opt_js', $.toJSON(this.opt_js), days);
-  		if (reload) {
-  			window.location.reload();
-  		}
-  	}
+	set: function(opt, val, days, reload) {
+		this.opt_js[opt] = val;
+		setCookie('opt_js', $.toJSON(this.opt_js), days);
+		if (reload) {
+			window.location.reload();
+		}
+	}
 }
 <!-- IF SHOW_JUMPBOX -->
 $(document).ready(function(){
-  	$("div.jumpbox").html('\
-  		<span id="jumpbox-container"> \
-  		<select id="jumpbox"> \
-  			<option id="jumpbox-title" value="-1">&nbsp;&raquo;&raquo; {L_JUMPBOX_TITLE} &nbsp;</option> \
-  		</select> \
-  		</span> \
-  		<input id="jumpbox-submit" type="button" class="lite" value="{L_GO}" /> \
-  	');
-  	$('#jumpbox-container').one('click', function(){
-  		$('#jumpbox-title').html('&nbsp;&nbsp; {L_LOADING} ... &nbsp;');
-  		var jumpbox_src = '{AJAX_HTML_DIR}' + ({LOGGED_IN} ? 'jumpbox_user.html' : 'jumpbox_guest.html');
-  		$(this).load(jumpbox_src);
-  		$('#jumpbox-submit').click(function(){ window.location.href='{FORUM_URL}'+$('#jumpbox').val(); });
-  	});
+	$("div.jumpbox").html('\
+		<span id="jumpbox-container"> \
+		<select id="jumpbox"> \
+			<option id="jumpbox-title" value="-1">&nbsp;&raquo;&raquo; {L_JUMPBOX_TITLE} &nbsp;</option> \
+		</select> \
+		</span> \
+		<input id="jumpbox-submit" type="button" class="lite" value="{L_GO}" /> \
+	');
+	$('#jumpbox-container').one('click', function(){
+		$('#jumpbox-title').html('&nbsp;&nbsp; {L_LOADING} ... &nbsp;');
+		var jumpbox_src = '{AJAX_HTML_DIR}' + ({LOGGED_IN} ? 'jumpbox_user.html' : 'jumpbox_guest.html');
+		$(this).load(jumpbox_src);
+		$('#jumpbox-submit').click(function(){ window.location.href='{FORUM_URL}'+$('#jumpbox').val(); });
+	});
 });
 <!-- ENDIF -->
 
@@ -218,17 +217,17 @@ var ajax = new Ajax('{SITE_URL}{$bb_cfg['ajax_url']}', 'POST', 'json');
 
 function getElText (e)
 {
-  	var t = '';
-  	if (e.textContent !== undefined) { t = e.textContent; } else if (e.innerText !== undefined) { t = e.innerText; } else { t = jQuery(e).text(); }
-  	return t;
+	var t = '';
+	if (e.textContent !== undefined) { t = e.textContent; } else if (e.innerText !== undefined) { t = e.innerText; } else { t = jQuery(e).text(); }
+	return t;
 }
 function escHTML (txt)
 {
   	return txt.replace(/</g, '&lt;');
 }
 <!-- IF USE_TABLESORTER -->
-$(document).ready(function(){
-  	$('.tablesorter').tablesorter(); //	{debug: true}
+$(document).ready(function() {
+	$('.tablesorter').tablesorter();
 });
 <!-- ENDIF -->
 
@@ -284,13 +283,13 @@ input[type="checkbox"] { margin-bottom: -1px; }
 var dev = true;
 function OpenInEditor ($file, $line)
 {
-  	$editor_path = '{EDITOR_PATH}';
-  	$editor_args = '{EDITOR_ARGS}';
+	$editor_path = '{EDITOR_PATH}';
+	$editor_args = '{EDITOR_ARGS}';
 
-  	$url = BB_ROOT +'develop/open_editor.php';
-  	$url += '?prog='+ $editor_path +'&args='+ $editor_args.sprintf($file, $line);
+	$url = BB_ROOT +'develop/open_editor.php';
+	$url += '?prog='+ $editor_path +'&args='+ $editor_args.sprintf($file, $line);
 
-  	window.open($url,'','height=1,width=1,left=1,top=1,resizable=yes,scrollbars=no,toolbar=no');
+	window.open($url,'','height=1,width=1,left=1,top=1,resizable=yes,scrollbars=no,toolbar=no');
 }
 </script>
 <!-- ENDIF / INCLUDE_DEVELOP_JS -->
@@ -431,7 +430,7 @@ if (top != self) {
 <div id="logo">
 	<!--<h1>{SITENAME}</h1>
 	<h6>{SITE_DESCRIPTION}</h6> -->
-	<a href="{U_INDEX}"><img src="images/logo/logo.png" alt="{SITENAME}" /></a>
+	<a href="{U_INDEX}"><img src="images/logo/logo_me.png" alt="{SITENAME}" /></a>
 </div>
 <!--/logo-->