diff -Nur e-smith-pop3-2.4.0/createlinks e-smith-pop3-2.4.0_bz8716/createlinks
--- e-smith-pop3-2.4.0/createlinks	2013-02-07 23:09:04.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/createlinks	2014-12-04 23:10:43.715000000 +0100
@@ -5,7 +5,7 @@
 foreach my $event (qw(
     bootstrap-console-save network-delete network-create email-update))
 {
-    foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local))
+    foreach (qw(pop3/peers/0 pop3/peers/local pop3s/peers/0 pop3s/peers/local pop3s/stunnel.conf))
     {
         templates2events("/var/service/$_", $event);
     }
diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT
--- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT	2013-02-07 23:09:04.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT	2014-12-04 23:12:04.622000000 +0100
@@ -1,6 +1,6 @@
 {
 # memory limit to catch any memory leak before it kills the system
-my $MIN_MEMORY_LIMIT = 40000000;
+my $MIN_MEMORY_LIMIT = 80000000;
 
 # The MIN_MEMORY_LIMIT is returned unless the DB variable is defined and greater than MIN_MEMORY_LIMIT
 my $limit = $pop3s{MemLimit} || $MIN_MEMORY_LIMIT;
diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl
--- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/10ssl	2014-12-04 23:07:29.433000000 +0100
@@ -0,0 +1,4 @@
+cert = /service/imap/ssl/imapd.pem
+options = NO_SSLv2
+options = NO_SSLv3
+
diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground
--- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/20foreground	2014-12-04 23:07:46.342000000 +0100
@@ -0,0 +1 @@
+foreground = yes
diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service
--- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/30service	2014-12-04 23:07:58.608000000 +0100
@@ -0,0 +1 @@
+service = pop3s
diff -Nur e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec
--- e-smith-pop3-2.4.0/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/etc/e-smith/templates/var/service/pop3s/stunnel.conf/40exec	2014-12-04 23:08:39.614000000 +0100
@@ -0,0 +1,2 @@
+exec = /var/qmail/bin/qmail-popup
+execargs = qmail-popup {$SystemName}.{$DomainName} checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
diff -Nur e-smith-pop3-2.4.0/root/var/service/pop3s/run e-smith-pop3-2.4.0_bz8716/root/var/service/pop3s/run
--- e-smith-pop3-2.4.0/root/var/service/pop3s/run	2013-02-07 23:09:04.000000000 +0100
+++ e-smith-pop3-2.4.0_bz8716/root/var/service/pop3s/run	2014-12-04 23:13:04.307000000 +0100
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-hostname=$(/sbin/e-smith/config get SystemName)
-domain=$(/sbin/e-smith/config get DomainName)
-fqdn="$hostname.$domain"
 MEM="`head -1 ./env/MEMLIMIT`"
 
 exec 2>&1
@@ -15,6 +12,4 @@
 	-l ${LOCALNAME:-0} \
 	${LISTENIP:-0} \
 	${PORT:-pop3s} \
-	    sslio -vv -/ /service/imap/ssl -u stunnel -C imapd.pem \
-		    /var/qmail/bin/qmail-popup $fqdn \
-			checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
+           /usr/bin/stunnel stunnel.conf