diff --git a/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/00Setup b/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/00Setup
new file mode 100644
index 0000000..be77f17
--- /dev/null
+++ b/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/00Setup
@@ -0,0 +1,14 @@
+{
+# vim: ft=perl:
+die "USERNAME not set." unless defined ($USERNAME);
+
+use esmith::AccountsDB;
+$adb = esmith::AccountsDB->open_ro or die "Couldn't open AccountsDB";
+
+$user = $adb->get($USERNAME) or die "No user $USERNAME in AccountsDB";
+
+%props = $user->props;
+$props{EmailForward} ||= 'local';
+
+$OUT = '';
+}
diff --git a/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/10Message b/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/10Message
new file mode 100644
index 0000000..a9d8b43
--- /dev/null
+++ b/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/10Message
@@ -0,0 +1,28 @@
+{
+
+use esmith::I18N;
+use Locale::gettext;
+use MIME::Lite;
+
+my $i18n = new esmith::I18N;
+$i18n->setLocale('lockAutoReply.tmpl');
+
+my $fwd = ($props{EmailForward} =~ /^(forward|both)$/) ?
+  sprintf(gettext("Your mail has been forwarded to %s"), ($props{ForwardAddress} || 'devnull@' . $DomainName)) . ".\n" .
+  gettext("This forward is only temporary, you should update your addressbook.") : "";
+
+my $msg = MIME::Lite->new(
+  Subject => gettext("This account is no longer valid"),
+  From    => "\$USER@" . $DomainName,
+  Data    => gettext("This is an automatic message in reply to your email with the following subject:") . "\n\n" .
+             '%S' . "\n\n" .
+             gettext("I'm sorry to inform you that the email address \$RECIPIENT is no longer valid.") . "\n" . $fwd
+);
+
+$msg->scrub([ 'Date' ]);
+$msg->attr("content-type"         => "text/plain");
+$msg->attr("content-type.charset" => "utf-8");
+
+$OUT = $msg->as_string;
+
+}
diff --git a/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/template-begin b/root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/template-begin
similarity index 100%
rename from root/etc/e-smith/templates-user/lock-auto-reply/message.txt/template-begin
rename to root/etc/e-smith/templates-user/.lock-auto-reply/message.txt/template-begin
diff --git a/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/00Setup b/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/00Setup
deleted file mode 100644
index cecf35b..0000000
--- a/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/00Setup
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-
-use Locale::gettext;
-use esmith::I18N;
-my $i18n = new esmith::I18N;
-$i18n->setLocale('expireAutoReply.tmpl');
-
-}
diff --git a/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/10Message b/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/10Message
deleted file mode 100644
index 5ab3330..0000000
--- a/root/etc/e-smith/templates-user/lock-auto-reply/message.txt/10Message
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-
-use Mime::Lite;
-my $msg = MIME::Lite->new(
-  Subject => gettext("This account is no longer valid"),
-  From    => "\$USER@" . $DomainName
-  Data    => gettext("This is an automatic message in reply to your email with the following subject:") . "\n" .
-             "%S" .
-             gettext("I'm sorry to inform you that the email address \$RECIPIENT is no longer valid") .
-             ($props{EmailForward} =~ /^(forward|both)$/) ? sprintf(gettext("Your mail has been forwarded to %s"), $props{ForwardAddress}) .
-                                                            gettext("This forward is only temporary, you should update your addressbook") : "";
-);
-
-$msg->attr("content-type"         => "text/plain");
-$msg->attr("content-type.charset" => "utf-8");
-
-$OUT = $msg->as_string;
-
-}