diff --git a/src/config.h b/src/config.h
index ce27e55..72063f9 100644
--- a/src/config.h
+++ b/src/config.h
@@ -10,10 +10,11 @@
 #include "params.h"
 
 #define PROGNAME "piler"
+#define PILERGETD_PROGNAME "pilergetd"
 
-#define VERSION "0.1.23-master-branch"
+#define VERSION "0.1.23"
 
-#define BUILD 785
+#define BUILD 789
 
 #define HOSTID "mailarchiver"
 
@@ -24,6 +25,7 @@
 #define CLAMD_SOCKET "/tmp/clamd"
 
 #define PIDFILE "/var/run/piler/piler.pid"
+#define PILERGETD_PIDFILE "/var/run/piler/pilergetd.pid"
 #define QUARANTINELEN 255
 #define TIMEOUT 60
 #define TIMEOUT_USEC 500000
diff --git a/webui/controller/health/worker.php b/webui/controller/health/worker.php
index 92045cd..f33598d 100644
--- a/webui/controller/health/worker.php
+++ b/webui/controller/health/worker.php
@@ -29,6 +29,9 @@
          die("go away");
       }
 
+      ini_set("default_socket_timeout", 5);
+
+
       foreach (Registry::get('health_smtp_servers') as $smtp) {
          $this->data['health'][] = $this->model_health_health->checksmtp($smtp, $lang->data['text_error']);
       }
diff --git a/webui/view/theme/orig/stylesheet/style-orig.css b/webui/view/theme/orig/stylesheet/style-orig.css
index 028a88b..bc46e10 100644
--- a/webui/view/theme/orig/stylesheet/style-orig.css
+++ b/webui/view/theme/orig/stylesheet/style-orig.css
@@ -7,15 +7,13 @@
 
 	.mybody { background-color: #6D6D6D; color: #3d3d3d; }
 
-	#piler1 { min-height: 860px; background: #ffffff; border: 3px solid black; position: relative; margin-left: auto; margin-right: auto; height: auto; padding-top: 0px; }
+	#piler1 { width: 100%; height: 100%; background: #ffffff; border: 0px solid black; position: absolute; margin-left: auto; margin-right: auto; padding-top: 0px; }
 
 	#messagebox1 { position: absolute; top: 0px; left: 50%; border: 3px solid red; display: none; background: orange; color: #000000; font-weight: bold; padding: 15px; z-index: 1; }
 	#searchpopup1 { position: absolute; top: 30px; left: 0px; border: 1px solid #999999; display: none; background: #f8f8f8; color: #000000; font-weight: bold; padding: 15px; z-index: 1; }
         #popupx { position: absolute; right: 10px; top: 5px; margin: 10px; }
 
-	.aoo { cursor: pointer; position: absolute; left: 570px; top: 0px; width: 10px; margin-left: -5px; }
-	.aoq { height: 4px; padding: 11px 5px; width: 7px; background: url("/view/theme/orig/images/dark-grey-disclosure-arrow-down.png") no-repeat scroll center center transparent; }
-
+        #advsearch_caret { position: absolute; top: 15px; margin-left: -20px; margin-right: 20px; }
 
 	#wrapemail { margin-left: 20px; background-color: white; width:200px; height: 300px; }
         .email { background-color: white; }
diff --git a/webui/view/theme/orig/templates/common/layout-search.tpl b/webui/view/theme/orig/templates/common/layout-search.tpl
index 674190d..9a6556f 100644
--- a/webui/view/theme/orig/templates/common/layout-search.tpl
+++ b/webui/view/theme/orig/templates/common/layout-search.tpl
@@ -46,10 +46,7 @@
 
          <input type="text" id="_search" name="_search" class="input-medium search-query span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
 
-         <div class="aoo" onclick="$('#searchpopup1').show();">
-            <div class="aoq"></div>
-         </div>
-
+         <a id="advsearch_caret" href="#" onclick="$('#searchpopup1').show();"><b class="caret"></b></a>
 
          <button id="button_search" class="btn btn-danger" onclick="Piler.expert(this); return false;"><?php print $text_search; ?></button>
 
diff --git a/webui/view/theme/orig/templates/common/layout.tpl b/webui/view/theme/orig/templates/common/layout.tpl
index 898f1a6..33277bd 100644
--- a/webui/view/theme/orig/templates/common/layout.tpl
+++ b/webui/view/theme/orig/templates/common/layout.tpl
@@ -35,7 +35,7 @@
       <?php print $menu; ?>
    </div>
 
-   <div id="main" align="center">
+   <div id="mainscreen">
 
       <?php if($title) { ?><h3 class="title"><?php print $title; ?></h3><?php } ?>