diff --git a/init.d/Makefile.in b/init.d/Makefile.in
index fdfa2146..60834657 100644
--- a/init.d/Makefile.in
+++ b/init.d/Makefile.in
@@ -24,13 +24,14 @@ INSTALL = @INSTALL@
 
 all:
 	sed -e "s%SBINDIR%$(sbindir)%" -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/rc.piler.in > $(srcdir)/rc.piler
+	sed -e "s%SBINDIR%$(sbindir)%" -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/rc.pilergetd.in > $(srcdir)/rc.pilergetd
 	sed -e "s%BINDIR%$(bindir)%" -e "s%SYSCONFDIR%$(sysconfdir)%" $(srcdir)/rc.searchd.in > $(srcdir)/rc.searchd
 
 
 install:
 
 clean:
-	rm -f rc.piler rc.searchd
+	rm -f rc.piler rc.pilergetd rc.searchd
 
 distclean: clean
 	rm -f Makefile
diff --git a/init.d/rc.piler.in b/init.d/rc.piler.in
index d1a043db..abea8b24 100644
--- a/init.d/rc.piler.in
+++ b/init.d/rc.piler.in
@@ -7,12 +7,12 @@ PID_FILE=`SBINDIR/pilerconf -q pidfile | cut -f2 -d=`
 PID_NUMBER=`test -f ${PID_FILE} && cat ${PID_FILE}`
 
 start() {
-	echo "starting piler . . ."
+	echo "starting $NAME . . ."
 	SBINDIR/piler -d
 }
 
 stop() {
-	echo "stopping piler"
+	echo "stopping $NAME"
 	kill ${PID_NUMBER}
 }
 
diff --git a/init.d/rc.pilergetd.in b/init.d/rc.pilergetd.in
new file mode 100644
index 00000000..938e12d1
--- /dev/null
+++ b/init.d/rc.pilergetd.in
@@ -0,0 +1,50 @@
+#!/bin/sh
+##
+##
+
+NAME=pilergetd
+PID_FILE=`SBINDIR/pilerconf -q pilergetd_pidfile | cut -f2 -d=`
+PID_NUMBER=`test -f ${PID_FILE} && cat ${PID_FILE}`
+
+start() {
+	echo "starting $NAME . . ."
+	SBINDIR/pilergetd -d
+}
+
+stop() {
+	echo "stopping $NAME"
+	kill ${PID_NUMBER}
+}
+
+check_status(){
+        test -f /proc/${PID_NUMBER}/status
+}
+
+case "$1" in
+	start)
+		start;
+   	;;
+
+	stop)
+		stop;
+   	;;
+
+        status)
+                if check_status;
+                 then
+                echo "${NAME} is running."
+                 else
+                echo "${NAME} is not running."
+                fi
+        ;;
+
+	restart)
+		stop;
+		sleep 1;
+		start;
+   	;;
+
+	*)
+		echo "Usage: $0 start|stop|restart|status"
+esac
+
diff --git a/src/config.h b/src/config.h
index 3ee240df..d8fc9928 100644
--- a/src/config.h
+++ b/src/config.h
@@ -14,7 +14,7 @@
 
 #define VERSION "0.1.24-master-branch"
 
-#define BUILD 791
+#define BUILD 792
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/retr.c b/src/retr.c
index 3ccc7bc2..23e4209d 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -188,7 +188,7 @@ int handle_pilerget_request(int new_sd, struct __data *data, struct __config *cf
          trimBuffer(puf);
          q = &muf[0];
 
-         if(strcmp(&puf[5], cfg->pilergetd_password))
+         if(strcmp(&puf[5], cfg->pilergetd_password)){
             snprintf(resp, sizeof(resp)-1, "550 AUTH FAILED\r\n");
          }
          else {
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index bd392989..212dec9e 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -132,7 +132,7 @@
             <input type="hidden" id="tag_keys" name="tag_keys" value="<?php print $all_ids; ?>" />
             <input type="hidden" id="_ref" name="_ref" value="<?php if(isset($_ref)) { print $_ref; } ?>" />
             <span id="tagbox" class="input-prepend input-append">
-                <span class="add-on"><i class="icon-tags icon-large" title="Tag"></i>&nbsp;<?php print $text_tag_search_results; ?>:</span>
+                <span class="add-on"><i class="icon-tags icon-large" title="Tag"></i>&nbsp;<?php print $text_tag_selected_messages; ?>:</span>
                 <input type="text" id="tag_value" name="tag_value" class="tagtext" />
                 <input type="button" class="btn btn-info" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>');" value="Tag" />
             </span>