diff --git a/src/messenger/webim/libs/userinfo.php b/src/messenger/webim/libs/userinfo.php
new file mode 100644
index 00000000..df4cb2e0
--- /dev/null
+++ b/src/messenger/webim/libs/userinfo.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * This file is part of Web Instant Messenger project.
+ *
+ * Copyright (c) 2005-2009 Web Messenger Community
+ * All rights reserved. This program and the accompanying materials
+ * are made available under 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
+ *
+ * Contributors:
+ *    Evgeny Gryaznov - initial API and implementation
+ */
+
+function get_useragent_version($userAgent) {
+    global $knownAgents;
+    if (is_array($knownAgents)) {
+	$userAgent = strtolower($userAgent);
+	foreach( $knownAgents as $agent ) {
+		if( strstr($userAgent,$agent) ) {
+			if( preg_match( "/".$agent."[\\s\/]?(\\d+(\\.\\d+(\\.\\d+(\\.\\d+)?)?)?)/", $userAgent, $matches ) ) {
+				$ver = $matches[1];
+				if($agent=='safari') {
+					if(preg_match( "/version\/(\\d+(\\.\\d+(\\.\\d+)?)?)/", $userAgent, $matches)) {
+						$ver = $matches[1];
+					} else {
+						$ver = "1 or 2 (build ".$ver.")";
+					}
+					if(preg_match( "/mobile\/(\\d+(\\.\\d+(\\.\\d+)?)?)/", $userAgent, $matches)) {
+						$userAgent = "iPhone ".$matches[1]." ($agent $ver)";
+						break;
+					}
+				}
+
+				$userAgent = ucfirst($agent)." ".$ver;
+				break;
+			}
+		}
+	}
+    }
+    return $userAgent;
+}
+
+function get_user_addr($addr) {
+	global $settings;
+	if($settings['geolink'] && preg_match( "/(\\d+\\.\\d+\\.\\d+\\.\\d+)/", $addr, $matches )) {
+		$userip = $matches[1];
+		return get_popup(str_replace("{ip}", $userip, $settings['geolink']), '', htmlspecialchars($addr), "GeoLocation", "ip$userip", $settings['geolinkparams']);
+	}
+	return htmlspecialchars($addr);
+}
+
+?>
\ No newline at end of file
diff --git a/src/messenger/webim/operator/history.php b/src/messenger/webim/operator/history.php
index 2689bb9e..fae58114 100644
--- a/src/messenger/webim/operator/history.php
+++ b/src/messenger/webim/operator/history.php
@@ -15,9 +15,11 @@
 require_once('../libs/common.php');
 require_once('../libs/operator.php');
 require_once('../libs/chat.php');
+require_once('../libs/userinfo.php');
 require_once('../libs/pagination.php');
 
 $operator = check_login();
+loadsettings();
 
 $page = array( 'operator' => topage(get_operator_name($operator)) );
 $query = isset($_GET['q']) ? myiconv(getoutputenc(), $webim_encoding, $_GET['q']) : false;
diff --git a/src/messenger/webim/operator/update.php b/src/messenger/webim/operator/update.php
index c0284672..6e63d3fc 100644
--- a/src/messenger/webim/operator/update.php
+++ b/src/messenger/webim/operator/update.php
@@ -14,6 +14,7 @@
 
 require_once('../libs/common.php');
 require_once('../libs/chat.php');
+require_once('../libs/userinfo.php');
 require_once('../libs/operator.php');
 
 $operator = get_logged_in();
@@ -39,44 +40,6 @@ $threadstate_key = array(
 	$state_loading => "chat.thread.state_loading"
 );
 
-function get_useragent_version($userAgent) {
-    global $knownAgents;
-    if (is_array($knownAgents)) {
-	$userAgent = strtolower($userAgent);
-	foreach( $knownAgents as $agent ) {
-		if( strstr($userAgent,$agent) ) {
-			if( preg_match( "/".$agent."[\\s\/]?(\\d+(\\.\\d+(\\.\\d+(\\.\\d+)?)?)?)/", $userAgent, $matches ) ) {
-				$ver = $matches[1];
-				if($agent=='safari') {
-					if(preg_match( "/version\/(\\d+(\\.\\d+(\\.\\d+)?)?)/", $userAgent, $matches)) {
-						$ver = $matches[1];
-					} else {
-						$ver = "1 or 2 (build ".$ver.")";
-					}
-					if(preg_match( "/mobile\/(\\d+(\\.\\d+(\\.\\d+)?)?)/", $userAgent, $matches)) {
-						$userAgent = "iPhone ".$matches[1]." ($agent $ver)";
-						break;
-					}
-				}
-
-				$userAgent = ucfirst($agent)." ".$ver;
-				break;
-			}
-		}
-	}
-    }
-    return $userAgent;
-}
-
-function get_user_addr($addr) {
-	global $settings;
-	if($settings['geolink'] && preg_match( "/(\\d+\\.\\d+\\.\\d+\\.\\d+)/", $addr, $matches )) {
-		$userip = $matches[1];
-		return get_popup(str_replace("{ip}", $userip, $settings['geolink']), '', htmlspecialchars($addr), "GeoLocation", "ip$userip", $settings['geolinkparams']);
-	}
-	return htmlspecialchars($addr);
-}
-
 function thread_to_xml($thread,$link) {
 	global $state_chatting, $threadstate_to_string, $threadstate_key,
 			$webim_encoding, $operator, $settings,
diff --git a/src/messenger/webim/operator/userhistory.php b/src/messenger/webim/operator/userhistory.php
index 4daf3f62..a387c1f0 100644
--- a/src/messenger/webim/operator/userhistory.php
+++ b/src/messenger/webim/operator/userhistory.php
@@ -15,9 +15,11 @@
 require_once('../libs/common.php');
 require_once('../libs/operator.php');
 require_once('../libs/chat.php');
+require_once('../libs/userinfo.php');
 require_once('../libs/pagination.php');
 
 $operator = check_login();
+loadsettings();
 
 $page = array( 'operator' => topage(get_operator_name($operator)) );
 
diff --git a/src/messenger/webim/view/thread_search.php b/src/messenger/webim/view/thread_search.php
index 2def3b75..025c3f6a 100644
--- a/src/messenger/webim/view/thread_search.php
+++ b/src/messenger/webim/view/thread_search.php
@@ -79,7 +79,7 @@
 					<a href="<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>" target="_blank" onclick="this.newWindow = window.open('<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"><?php echo topage(htmlspecialchars($chatthread['userName'])) ?></a>
 				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
 				<td height='30' class='table'>
-					<?php echo topage(htmlspecialchars($chatthread['remote'])) ?>
+        			<?php echo get_user_addr(topage($chatthread['remote'])) ?>
 				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
 				<td height='30' class='table'>
         			<?php if( $chatthread['agentName'] ) { ?><?php echo topage(htmlspecialchars($chatthread['agentName'])) ?><?php } ?>
@@ -88,7 +88,7 @@
         			<?php echo topage(htmlspecialchars($chatthread['size'])) ?>
 				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
 				<td height='30' class='table'>
-					<?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>,  <?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>
+					<?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
 				</td>
 			</tr>
 			<tr><td height='2' colspan='9'></td></tr><tr><td bgcolor='#e1e1e1' colspan='9'><img width='1' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td></tr><tr><td height='2' colspan='9'></td></tr>
diff --git a/src/messenger/webim/view/userhistory.php b/src/messenger/webim/view/userhistory.php
index d0a92b78..b6e7174c 100644
--- a/src/messenger/webim/view/userhistory.php
+++ b/src/messenger/webim/view/userhistory.php
@@ -2,7 +2,7 @@
 /*
  * This file is part of Web Instant Messenger project.
  *
- * Copyright (c) 2005-2008 Web Messenger Community
+ * Copyright (c) 2005-2009 Web Messenger Community
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,209 +10,83 @@
  *
  * Contributors:
  *    Evgeny Gryaznov - initial API and implementation
- *
- *    Ido Green - add more features (base on ID: 2492353)
  */
 ?>
 <html>
-    <head>
+<head>
 
 
 
-        <link rel="stylesheet" type="text/css" media="all" href="<?php echo $webimroot ?>/styles.css" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo $webimroot ?>/styles.css" />
 
 
-        <link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
-        <title>
-            <?php echo getlocal("page.analysis.userhistory.title") ?> - <?php echo getlocal("app.title") ?>
-        </title>
+<link rel="shortcut icon" href="<?php echo $webimroot ?>/images/favicon.ico" type="image/x-icon"/>
+<title>
+	<?php echo getlocal("page.analysis.userhistory.title") ?> - <?php echo getlocal("app.title") ?>
+</title>
 
-        <meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
-        <meta http-equiv="description" content="<?php echo getlocal("page.main_layout.meta_description") ?>">
-    </head>
+<meta http-equiv="keywords" content="<?php echo getlocal("page.main_layout.meta_keyword") ?>">
+<meta http-equiv="description" content="<?php echo getlocal("page.main_layout.meta_description") ?>">
+</head>
 
-    <body bgcolor="#FFFFFF" text="#000000" link="#2971C1" vlink="#2971C1" alink="#2971C1">
+<body bgcolor="#FFFFFF" text="#000000" link="#2971C1" vlink="#2971C1" alink="#2971C1">
 
-        <table width="100%" cellpadding="2" cellspacing="0" border="0">
-            <tr>
-                <td valign="top" class="text">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<tr>
+<td valign="top" class="text">
 
-                    <table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="left" valign="top">
-                                <h1><?php echo getlocal("page.analysis.userhistory.title") ?></h1>
-                            </td>
-                            <td align="right" class="text" valign="top">
-                                <table cellspacing="0" cellpadding="0" border="0"><tr>
-                                        <td class="textform">
-                                            <?php echo getlocal2("menu.operator",array($page['operator'])) ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+ <table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="left" valign="top">
+		<h1><?php echo getlocal("page.analysis.userhistory.title") ?></h1>
+ </td><td align="right" class="text" valign="top"><table cellspacing="0" cellpadding="0" border="0"><tr><td class="textform"><?php echo getlocal2("menu.operator",array($page['operator'])) ?></td></tr></table></td></tr></table>
 
-                    <?php echo getlocal("page.analysis.userhistory.intro") ?>
 
-                    <br/><br/>
 
-                    <?php if( $page['pagination'] && $page['pagination.items'] ) { ?>
-                    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-                        <tr>
-                            <td class='table' bgcolor='#276db8' height='30'><span class='header'>
-                                <?php echo getlocal("page.analysis.search.head_name") ?></span>
-                            </td>
-                            <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.head_host") ?>
-                            </span></td>
-                            <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.head_operator") ?>
-                                </span>
-                            </td>
-                            <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.head_time") ?>
-                                </span>
-                            </td>
+<?php echo getlocal("page.analysis.userhistory.intro") ?>
 
-                            <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.head_geo") ?>
-                                </span>
-                            </td>
-                            <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.user_agent") ?>
-                                </span>
-                            </td>
-                             <td width='3'>
-                            </td>
-                            <td class='table' bgcolor='#276db8' height='30'>
-                                <span class='header'>
-                                    <?php echo getlocal("page.analysis.search.head_os") ?>
-                                </span>
-                            </td>
-                        </tr>
-                        <?php foreach( $page['pagination.items'] as $chatthread ) { ?>
-                        <tr>
-                            <td height='30' class='table'>
-                                <a href="<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>" target="_blank" onclick="this.newWindow = window.open('<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"><?php echo htmlspecialchars(topage($chatthread['userName'])) ?></a>
-                            </td>
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php echo htmlspecialchars(topage($chatthread['remote'])) ?>
-                            </td>
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php if( $chatthread['agentName'] ) { ?><?php echo htmlspecialchars(topage($chatthread['agentName'])) ?><?php } ?>
-                            </td>
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>, took:
-                                <?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>
-                            </td>
+<br/><br/>
 
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php
-                                $t_ip = $chatthread['remote'];
-                                echo "<a href='http://api.hostip.info/get_html.php?ip=" . $t_ip . "'>More details</a> ";
-                                echo "<IMG SRC='http://api.hostip.info/flag.php?ip=" . $t_ip . "' ALT='N/A Flag'>";
-                                ?>
-                            </td>
+<?php if( $page['pagination'] && $page['pagination.items'] ) { ?>
+	<table cellpadding="0" cellspacing="0" border="0" width="100%">
+		<tr>
+			<td class='table' bgcolor='#276db8' height='30'><span class='header'><?php echo getlocal("page.analysis.search.head_name") ?></span></td><td width='3'></td>
+			<td class='table' bgcolor='#276db8' height='30'><span class='header'><?php echo getlocal("page.analysis.search.head_host") ?></span></td><td width='3'></td>
+			<td class='table' bgcolor='#276db8' height='30'><span class='header'><?php echo getlocal("page.analysis.search.head_operator") ?></span></td><td width='3'></td>
+			<td class='table' bgcolor='#276db8' height='30'><span class='header'><?php echo getlocal("page.analysis.search.head_time") ?></span></td>
+		</tr>
+		<?php foreach( $page['pagination.items'] as $chatthread ) { ?>
+			<tr>
+				<td height='30' class='table'>
+					<a href="<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>" target="_blank" onclick="this.newWindow = window.open('<?php echo $webimroot ?>/operator/threadprocessor.php?threadid=<?php echo $chatthread['threadid'] ?>', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"><?php echo htmlspecialchars(topage($chatthread['userName'])) ?></a>
+				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
+				<td height='30' class='table'>
+        			<?php echo get_user_addr(topage($chatthread['remote'])) ?>
+				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
+				<td height='30' class='table'>
+        			<?php if( $chatthread['agentName'] ) { ?><?php echo htmlspecialchars(topage($chatthread['agentName'])) ?><?php } ?>
+				</td><td background='<?php echo $webimroot ?>/images/tablediv3.gif'><img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td>
+				<td height='30' class='table'>
+					<?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
+				</td>
+			</tr>
+			<tr><td height='2' colspan='7'></td></tr><tr><td bgcolor='#e1e1e1' colspan='7'><img width='1' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'></td></tr><tr><td height='2' colspan='7'></td></tr>
+		<?php } ?>
+	</table>
+	<br />
+	<?php echo generate_pagination($page['pagination']) ?>
+<?php } ?>
+<?php if( $page['pagination'] && !$page['pagination.items'] ) { ?>
+	<br/><br/>
+	<table cellspacing='0' cellpadding='0' border='0'><tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
+		<span class="table">
+			<?php echo getlocal("tag.pagination.no_items") ?>
+		</span>
+	</table></td><td></td></tr><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlb.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrb.gif' width='16' height='16' border='0' alt=''></td></tr></table></td></tr></table>
+<?php } ?>
 
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php
-                                $first_name = $chatthread['userAgent'];
-                                $pos = strpos($first_name, " ");
-                                $first_name = substr($first_name, 0, $pos);
-                                echo "<span title='" . $chatthread['userAgent'] . "'>$first_name</span>";
-                                ?>
-                            </td>
+</td>
+</tr>
+</table>
 
-                            <td background='<?php echo $webimroot ?>/images/tablediv3.gif'>
-                                <img width='3' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                            <td height='30' class='table'>
-                                <?php
-                                $user_agent = $chatthread['userAgent'];
-                                $start = strpos($user_agent, "(");
-                                $end = strpos($user_agent, ")");
-                                $os = substr($user_agent, $start + 1, $end - $start - 1);
-                                echo $os;
-                                ?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td height='2' colspan='14'>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td bgcolor='#e1e1e1' colspan='14'>
-                                <img width='1' height='1' border='0' alt='' src='<?php echo $webimroot ?>/images/free.gif'>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td height='2' colspan='14'></td>
-                        </tr>
-                        <?php } ?>
-                    </table>
-                    <br />
-                    <?php echo generate_pagination($page['pagination']) ?>
-                    <?php } ?>
-                <?php if( $page['pagination'] && !$page['pagination.items'] ) { ?>
-                    <br/><br/>
-                    <table cellspacing='0' cellpadding='0' border='0'><tr><td background='<?php echo $webimroot ?>/images/loginbg.gif'><table cellspacing='0' cellpadding='0' border='0'><tr><td><img src='<?php echo $webimroot ?>/images/logincrnlt.gif' width='16' height='16' border='0' alt=''></td><td></td><td><img src='<?php echo $webimroot ?>/images/logincrnrt.gif' width='16' height='16' border='0' alt=''></td></tr><tr><td></td><td align='center'><table border='0' cellspacing='0' cellpadding='0'>
-                                                <span class="table">
-                                                    <?php echo getlocal("tag.pagination.no_items") ?>
-                                                </span>
-                                            </table>
-                                        </td>
-                                        <td>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <img src='<?php echo $webimroot ?>/images/logincrnlb.gif' width='16' height='16' border='0' alt=''>
-                                        </td>
-                                        <td>
-                                        </td>
-                                        <td>
-                                            <img src='<?php echo $webimroot ?>/images/logincrnrb.gif' width='16' height='16' border='0' alt=''>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
-                    <?php } ?>
-
-                </td>
-            </tr>
-        </table>
-
-    </body>
+</body>
 </html>