diff --git a/src/messenger/.buildpath b/src/messenger/.buildpath
deleted file mode 100644
index 8bcb4b5f..00000000
--- a/src/messenger/.buildpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="src" path=""/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-</buildpath>
diff --git a/src/messenger/.project b/src/messenger/.project
deleted file mode 100644
index 1885041d..00000000
--- a/src/messenger/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>messenger</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.dltk.core.scriptbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.php.core.PHPNature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/messenger/.settings/org.eclipse.core.resources.prefs b/src/messenger/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b324460a..00000000
--- a/src/messenger/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Sat May 08 00:52:18 CEST 2010
-eclipse.preferences.version=1
-encoding//webim/locales=UTF-8
-encoding//webim/locales/bg/properties=cp1251
-encoding//webim/locales/ca/properties=ISO-8859-1
-encoding//webim/locales/names/properties=utf-8
-encoding//webim/locales/ru=cp1251
-encoding//webim/locales/sp/properties=ISO-8859-1
-encoding//webim/locales/ua/properties=cp1251
diff --git a/src/messenger/pack.pl b/src/messenger/pack.pl
index eb5a04a7..5cb4a0a2 100755
--- a/src/messenger/pack.pl
+++ b/src/messenger/pack.pl
@@ -5,7 +5,7 @@
 ##################################################################
 
 $targetFolder = "deploy";
-$suffix = "164";
+$suffix = "165";
 
 ##################################################################
 # Copies tree into target folder, preprocess .phps
diff --git a/src/messenger/tools/header.txt b/src/messenger/tools/header.txt
index d00ac202..1c735e25 100644
--- a/src/messenger/tools/header.txt
+++ b/src/messenger/tools/header.txt
@@ -1,14 +1,13 @@
-This file is part of Mibew Messenger project.
+Copyright 2005-2013 the original author or authors.
 
-Copyright (c) 2005-2011 Mibew Messenger Community
-All rights reserved. The contents of this file are subject to the terms of
-the Eclipse Public License v1.0 which accompanies this distribution, and
-is available at http://www.eclipse.org/legal/epl-v10.html
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Alternatively, the contents of this file may be used under the terms of
-the GNU General Public License Version 2 or later (the "GPL"), in which case
-the provisions of the GPL are applicable instead of those above. If you wish
-to allow use of your version of this file only under the terms of the GPL, and
-not to allow others to use your version of this file under the terms of the
-EPL, indicate your decision by deleting the provisions above and replace them
-with the notice and other provisions required by the GPL.
\ No newline at end of file
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/src/messenger/tools/header_update.pl b/src/messenger/tools/header_update.pl
index 69ce5e92..044298c2 100755
--- a/src/messenger/tools/header_update.pl
+++ b/src/messenger/tools/header_update.pl
@@ -43,16 +43,9 @@ P: for $phpfile (grep { /\.php$/ } @allfiles) {
 	if($comment =~ /\[external\]/) {
 		next P;
 	};
-	die "no contributors in $phpfile" unless $comment =~ /Contributors:/;
-	$newcomment = $comment;
-	$newcomment =~ s/\s\*\s//g;
-	$newcomment =~ s/^\/\*//;
-	$newcomment =~ s/\*\/$//;
-	$newcomment =~ s/.*(Contributors:)/$1/s;
-	$newcomment =~ s/^\s+//;
-	$newcomment =~ s/\s+$//;
-	$newcomment = "$php_header\n\n$newcomment";
+	$newcomment = "$php_header";
 	$newcomment =~ s/^/ * /gm;
+	$newcomment =~ s/\s+$//gm;
 	$newcomment = "/*\n$newcomment\n */";
 	
 	$content =~ s/^(<\?php\n)\/\*.*?\*\//$1$newcomment/s;
diff --git a/src/messenger/webim/README b/src/messenger/webim/README
index 23eb567a..87cb10e7 100644
--- a/src/messenger/webim/README
+++ b/src/messenger/webim/README
@@ -1,5 +1,5 @@
 Mibew Messenger
-Copyright (c) 2005-2011 Mibew Messenger Community
+Copyright 2005-2013 the original author or authors.
 
 REQUIREMENTS
 
diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php
index ff2ced46..b5049537 100644
--- a/src/messenger/webim/libs/common.php
+++ b/src/messenger/webim/libs/common.php
@@ -20,8 +20,8 @@ session_start();
 require_once(dirname(__FILE__) . '/converter.php');
 require_once(dirname(__FILE__) . '/config.php');
 
-$version = '1.6.4';
-$jsver = "164";
+$version = '1.6.5';
+$jsver = "165";
 
 function myiconv($in_enc, $out_enc, $string)
 {