diff --git a/src/messenger/webim/view/userhistory.php b/src/messenger/webim/view/userhistory.php
index 32e33200..89a7dbca 100644
--- a/src/messenger/webim/view/userhistory.php
+++ b/src/messenger/webim/view/userhistory.php
@@ -10,83 +10,209 @@
  *
  * 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 echo getlocal("page.analysis.userhistory.intro") ?>
+                    <?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>
 
-<br/><br/>
+                            <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>
 
-<?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 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']) ?>,  <?php echo date_diff($chatthread['modified']-$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
+                                $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>
 
-</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
+                                $first_name = $chatthread['userAgent'];
+                                $pos = strpos($first_name, " ");
+                                $first_name = substr($first_name, 0, $pos);
+                                echo "<span title='" . $chatthread['userAgent'] . "'>$first_name</span>";
+                                ?>
+                            </td>
 
-</body>
+                            <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='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>
+            </tr>
+        </table>
+
+    </body>
 </html>
 
