message templates for amavis, new postfix config param for ldap table

14 files changed, 558 insertions, 1 deletions

diff --git a/conf/amavisd/de/template-dsn.txt b/conf/amavisd/de/template-dsn.txt
new file mode 100644
index 0000000..4f7824c
--- /dev/null
+++ b/conf/amavisd/de/template-dsn.txt
@@ -0,0 +1,48 @@
+#
+# =============================================================================
+# This is a template for (neutral: non-virus, non-spam, non-banned) DELIVERY
+# STATUS NOTIFICATIONS to sender. For syntax and customization instructions
+# see README.customize. Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: Undeliverable mail[?%#X||, invalid characters in header]
+Message-ID: <DSN%n@%h>
+
+[? %#X ||INVALID HEADER (INVALID CHARACTERS OR SPACE GAP)
+
+[%X\n]
+]\
+This nondelivery report was generated by the amavisd-new program
+at host %h. Our internal reference code for your message
+is %n.
+
+[? %#X ||
+WHAT IS AN INVALID CHARACTER IN MAIL HEADER?
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  It does not allow the use of characters with codes above 127 to be used
+  directly (non-encoded) in mail header (it also prohibits NUL and bare CR).
+
+  If characters (e.g. with diacritics) from ISO Latin or other alphabets
+  need to be included in the header, these characters need to be properly
+  encoded according to RFC 2047. This encoding is often done transparently
+  by mail reader (MUA), but if automatic encoding is not available (e.g.
+  by some older MUA) it is the user's responsibility to avoid the use
+  of such characters in mail header, or to encode them manually. Typically
+  the offending header fields in this category are 'Subject', 'Organization',
+  and comment fields in e-mail addresses of the 'From', 'To' and 'Cc'.
+
+  Sometimes such invalid header fields are inserted automatically
+  by some MUA, MTA, content checker, or other mail handling service.
+  If this is the case, that service needs to be fixed or properly configured.
+  Typically the offending header fields in this category are 'Date',
+  'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc.
+
+  If you don't know how to fix or avoid the problem, please report it
+  to _your_ postmaster or system manager.
+]\
+
+Return-Path: %s
+Your message[?%m|| %m][?%r|| (Resent-Message-ID: %r)]
+could not be delivered to:[\n   %N]
diff --git a/conf/amavisd/de/template-spam-admin.txt b/conf/amavisd/de/template-spam-admin.txt
new file mode 100644
index 0000000..92d1afa
--- /dev/null
+++ b/conf/amavisd/de/template-spam-admin.txt
@@ -0,0 +1,40 @@
+#
+# =============================================================================
+# This is a template for SPAM ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>]
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+[? %#B |#|Bcc: [<%B>|, ]]
+Message-ID: <SA%n@%h>
+
+Unsolicited bulk email [? %S |from unknown or forged sender:|from:]
+  %o
+Subject: %j
+
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+[? %#D |#|The message WILL BE delivered to:[\n%D]
+]
+[? %#N |#|The message WAS NOT delivered to:[\n%N]
+]
+[? %q |Not quarantined.|The message has been quarantined as:\n  %q
+]
+SpamAssassin report:
+[%A
+]\
+
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/amavisd/de/template-spam-sender.txt b/conf/amavisd/de/template-spam-sender.txt
new file mode 100644
index 0000000..62c1ba7
--- /dev/null
+++ b/conf/amavisd/de/template-spam-sender.txt
@@ -0,0 +1,27 @@
+#
+# =============================================================================
+# This is a template for SPAM SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: Considered UNSOLICITED BULK EMAIL from you
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <SS%n@%h>
+
+Your message to:[
+-> %R]
+
+was considered unsolicited bulk e-mail (UBE).
+[? %#X |#|\n[%X\n]]
+Subject: %j
+Return-Path: %s
+Our internal reference code for your message is %n.
+
+[? %#D |Delivery of the email was stopped!
+]#
+#
+# SpamAssassin report:
+# [%A
+# ]\
diff --git a/conf/amavisd/de/template-virus-admin.txt b/conf/amavisd/de/template-virus-admin.txt
new file mode 100644
index 0000000..fce666d
--- /dev/null
+++ b/conf/amavisd/de/template-virus-admin.txt
@@ -0,0 +1,55 @@
+#
+# =============================================================================
+# This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]#
+ FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>]
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+Message-ID: <VA%n@%h>
+
+[? %#V |No viruses were found.
+|A virus was found: %V
+|Two viruses were found:\n  %V
+|%#V viruses were found:\n  %V
+]
+[? %#F |#\
+|A banned name was found:\n  %F
+|Two banned names were found:\n  %F
+|%#F banned names were found:\n  %F
+]
+[? %#X |#\
+|Bad header was found:[\n  %X]
+]
+[? %#W |#\
+|Scanner detecting a virus: %W
+|Scanners detecting a virus: %W
+]
+The mail originated from: <%o>
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+[? %#S |Notification to sender will not be mailed.
+
+]#
+[? %#D |#|The message WILL BE delivered to:[\n%D]
+]
+[? %#N |#|The message WAS NOT delivered to:[\n%N]
+]
+[? %#V |#|[? %#v |#|Virus scanner output:[\n  %v]
+]]
+[? %q  |Not quarantined.|The message has been quarantined as:\n  %q
+]
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/amavisd/de/template-virus-recipient.txt b/conf/amavisd/de/template-virus-recipient.txt
new file mode 100644
index 0000000..e936a3e
--- /dev/null
+++ b/conf/amavisd/de/template-virus-recipient.txt
@@ -0,0 +1,36 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED/BAD-HEADER RECIPIENTS NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]#
+ IN MAIL TO YOU (from [?%o|(?)|<%o>])
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+Message-ID: <VR%n@%h>
+
+[? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|    [? %#V |viruses|virus|viruses]: %V]
+[? %#F |#|    banned [? %#F |names|name|names]: %F]
+[? %#X |#|\n[%X\n]]
+in an email to you [? %S |from unknown sender:|from:]
+
+  %o
+
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+Our internal reference code for this message is %n.
+[? %q |Not quarantined.|The message has been quarantined as:
+  %q]
+
+Please contact your system administrator for details.
diff --git a/conf/amavisd/de/template-virus-sender.txt b/conf/amavisd/de/template-virus-sender.txt
new file mode 100644
index 0000000..177e80f
--- /dev/null
+++ b/conf/amavisd/de/template-virus-sender.txt
@@ -0,0 +1,72 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <VS%n@%h>
+
+[? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|    [? %#V |viruses|virus|viruses]: %V]
+[? %#F |#|    banned [? %#F |names|name|names]: %F]
+[? %#X |#|\n[%X\n]]
+in email presumably from you (%s),
+to the following [? %#R |recipients|recipient|recipients]:[
+-> %R]
+
+Our internal reference code for your message is %n.
+
+[? %#V ||Please check your system for viruses,
+or ask your system administrator to do so.
+
+]#
+[? %#D |Delivery of the email was stopped!
+
+]#
+[? %#V |[? %#F ||#
+The message has been blocked because it contains a component
+(as a MIME part or nested within) with declared name
+or MIME type or contents type violating our access policy.
+
+To transfer contents that may be considered risky or unwanted
+by site policies, or simply too large for mailing, please consider
+publishing your content on the web, and only sending an URL of the
+document to the recipient.
+
+Depending on the recipient and sender site policies, with a little
+effort it might still be possible to send any contents (including
+viruses) using one of the following methods:
+
+- encrypted using pgp, gpg or other encryption methods;
+
+- wrapped in a password-protected or scrambled container or archive
+  (e.g.: zip -e, arj -g, arc g, rar -p, or other methods)
+
+Note that if the contents is not intended to be secret, the
+encryption key or password may be included in the same message
+for recipient's convenience.
+
+We are sorry for inconvenience if the contents was not malicious.
+
+The purpose of these restrictions is to cut the most common propagation
+methods used by viruses and other malware. These often exploit automatic
+mechanisms and security holes in certain mail readers (Microsoft mail
+readers and browsers are a common and easy target). By requiring an
+explicit and decisive action from the recipient to decode mail,
+the dangers of automatic malware propagation is largely reduced.
+#
+# Details of our mail restrictions policy are available at ...
+
+]]#
+For your reference, here are headers from your email:
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/amavisd/en_US/template-dsn.txt b/conf/amavisd/en_US/template-dsn.txt
new file mode 100644
index 0000000..4f7824c
--- /dev/null
+++ b/conf/amavisd/en_US/template-dsn.txt
@@ -0,0 +1,48 @@
+#
+# =============================================================================
+# This is a template for (neutral: non-virus, non-spam, non-banned) DELIVERY
+# STATUS NOTIFICATIONS to sender. For syntax and customization instructions
+# see README.customize. Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: Undeliverable mail[?%#X||, invalid characters in header]
+Message-ID: <DSN%n@%h>
+
+[? %#X ||INVALID HEADER (INVALID CHARACTERS OR SPACE GAP)
+
+[%X\n]
+]\
+This nondelivery report was generated by the amavisd-new program
+at host %h. Our internal reference code for your message
+is %n.
+
+[? %#X ||
+WHAT IS AN INVALID CHARACTER IN MAIL HEADER?
+
+  The RFC 2822 standard specifies rules for forming internet messages.
+  It does not allow the use of characters with codes above 127 to be used
+  directly (non-encoded) in mail header (it also prohibits NUL and bare CR).
+
+  If characters (e.g. with diacritics) from ISO Latin or other alphabets
+  need to be included in the header, these characters need to be properly
+  encoded according to RFC 2047. This encoding is often done transparently
+  by mail reader (MUA), but if automatic encoding is not available (e.g.
+  by some older MUA) it is the user's responsibility to avoid the use
+  of such characters in mail header, or to encode them manually. Typically
+  the offending header fields in this category are 'Subject', 'Organization',
+  and comment fields in e-mail addresses of the 'From', 'To' and 'Cc'.
+
+  Sometimes such invalid header fields are inserted automatically
+  by some MUA, MTA, content checker, or other mail handling service.
+  If this is the case, that service needs to be fixed or properly configured.
+  Typically the offending header fields in this category are 'Date',
+  'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc.
+
+  If you don't know how to fix or avoid the problem, please report it
+  to _your_ postmaster or system manager.
+]\
+
+Return-Path: %s
+Your message[?%m|| %m][?%r|| (Resent-Message-ID: %r)]
+could not be delivered to:[\n   %N]
diff --git a/conf/amavisd/en_US/template-spam-admin.txt b/conf/amavisd/en_US/template-spam-admin.txt
new file mode 100644
index 0000000..92d1afa
--- /dev/null
+++ b/conf/amavisd/en_US/template-spam-admin.txt
@@ -0,0 +1,40 @@
+#
+# =============================================================================
+# This is a template for SPAM ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>]
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+[? %#B |#|Bcc: [<%B>|, ]]
+Message-ID: <SA%n@%h>
+
+Unsolicited bulk email [? %S |from unknown or forged sender:|from:]
+  %o
+Subject: %j
+
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+[? %#D |#|The message WILL BE delivered to:[\n%D]
+]
+[? %#N |#|The message WAS NOT delivered to:[\n%N]
+]
+[? %q |Not quarantined.|The message has been quarantined as:\n  %q
+]
+SpamAssassin report:
+[%A
+]\
+
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/amavisd/en_US/template-spam-sender.txt b/conf/amavisd/en_US/template-spam-sender.txt
new file mode 100644
index 0000000..62c1ba7
--- /dev/null
+++ b/conf/amavisd/en_US/template-spam-sender.txt
@@ -0,0 +1,27 @@
+#
+# =============================================================================
+# This is a template for SPAM SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: Considered UNSOLICITED BULK EMAIL from you
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <SS%n@%h>
+
+Your message to:[
+-> %R]
+
+was considered unsolicited bulk e-mail (UBE).
+[? %#X |#|\n[%X\n]]
+Subject: %j
+Return-Path: %s
+Our internal reference code for your message is %n.
+
+[? %#D |Delivery of the email was stopped!
+]#
+#
+# SpamAssassin report:
+# [%A
+# ]\
diff --git a/conf/amavisd/en_US/template-virus-admin.txt b/conf/amavisd/en_US/template-virus-admin.txt
new file mode 100644
index 0000000..fce666d
--- /dev/null
+++ b/conf/amavisd/en_US/template-virus-admin.txt
@@ -0,0 +1,55 @@
+#
+# =============================================================================
+# This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]#
+ FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>]
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+Message-ID: <VA%n@%h>
+
+[? %#V |No viruses were found.
+|A virus was found: %V
+|Two viruses were found:\n  %V
+|%#V viruses were found:\n  %V
+]
+[? %#F |#\
+|A banned name was found:\n  %F
+|Two banned names were found:\n  %F
+|%#F banned names were found:\n  %F
+]
+[? %#X |#\
+|Bad header was found:[\n  %X]
+]
+[? %#W |#\
+|Scanner detecting a virus: %W
+|Scanners detecting a virus: %W
+]
+The mail originated from: <%o>
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+[? %#S |Notification to sender will not be mailed.
+
+]#
+[? %#D |#|The message WILL BE delivered to:[\n%D]
+]
+[? %#N |#|The message WAS NOT delivered to:[\n%N]
+]
+[? %#V |#|[? %#v |#|Virus scanner output:[\n  %v]
+]]
+[? %q  |Not quarantined.|The message has been quarantined as:\n  %q
+]
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/amavisd/en_US/template-virus-recipient.txt b/conf/amavisd/en_US/template-virus-recipient.txt
new file mode 100644
index 0000000..e936a3e
--- /dev/null
+++ b/conf/amavisd/en_US/template-virus-recipient.txt
@@ -0,0 +1,36 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED/BAD-HEADER RECIPIENTS NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed; non-standard header
+# field heads must begin with "X-" .
+#
+Date: %d
+From: %f
+Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]#
+ IN MAIL TO YOU (from [?%o|(?)|<%o>])
+To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]]
+[? %#C |#|Cc: [<%C>|, ]]
+Message-ID: <VR%n@%h>
+
+[? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|    [? %#V |viruses|virus|viruses]: %V]
+[? %#F |#|    banned [? %#F |names|name|names]: %F]
+[? %#X |#|\n[%X\n]]
+in an email to you [? %S |from unknown sender:|from:]
+
+  %o
+
+[? %a |#|First upstream SMTP client IP address: \[%a\] %g
+]
+[? %t |#|According to the 'Received:' trace, the message originated at:
+  \[%e\]
+  %t
+]
+Our internal reference code for this message is %n.
+[? %q |Not quarantined.|The message has been quarantined as:
+  %q]
+
+Please contact your system administrator for details.
diff --git a/conf/amavisd/en_US/template-virus-sender.txt b/conf/amavisd/en_US/template-virus-sender.txt
new file mode 100644
index 0000000..177e80f
--- /dev/null
+++ b/conf/amavisd/en_US/template-virus-sender.txt
@@ -0,0 +1,72 @@
+#
+# =============================================================================
+# This is a template for VIRUS/BANNED SENDER NOTIFICATIONS.
+# For syntax and customization instructions see README.customize.
+# Note that only valid header fields are allowed;
+# non-standard header field heads must begin with "X-" .
+# The From, To and Date header fields will be provided automatically.
+#
+Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU
+[? %m  |#|In-Reply-To: %m]
+Message-ID: <VS%n@%h>
+
+[? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT]
+
+Our content checker found
+[? %#V |#|    [? %#V |viruses|virus|viruses]: %V]
+[? %#F |#|    banned [? %#F |names|name|names]: %F]
+[? %#X |#|\n[%X\n]]
+in email presumably from you (%s),
+to the following [? %#R |recipients|recipient|recipients]:[
+-> %R]
+
+Our internal reference code for your message is %n.
+
+[? %#V ||Please check your system for viruses,
+or ask your system administrator to do so.
+
+]#
+[? %#D |Delivery of the email was stopped!
+
+]#
+[? %#V |[? %#F ||#
+The message has been blocked because it contains a component
+(as a MIME part or nested within) with declared name
+or MIME type or contents type violating our access policy.
+
+To transfer contents that may be considered risky or unwanted
+by site policies, or simply too large for mailing, please consider
+publishing your content on the web, and only sending an URL of the
+document to the recipient.
+
+Depending on the recipient and sender site policies, with a little
+effort it might still be possible to send any contents (including
+viruses) using one of the following methods:
+
+- encrypted using pgp, gpg or other encryption methods;
+
+- wrapped in a password-protected or scrambled container or archive
+  (e.g.: zip -e, arj -g, arc g, rar -p, or other methods)
+
+Note that if the contents is not intended to be secret, the
+encryption key or password may be included in the same message
+for recipient's convenience.
+
+We are sorry for inconvenience if the contents was not malicious.
+
+The purpose of these restrictions is to cut the most common propagation
+methods used by viruses and other malware. These often exploit automatic
+mechanisms and security holes in certain mail readers (Microsoft mail
+readers and browsers are a common and easy target). By requiring an
+explicit and decisive action from the recipient to decode mail,
+the dangers of automatic malware propagation is largely reduced.
+#
+# Details of our mail restrictions policy are available at ...
+
+]]#
+For your reference, here are headers from your email:
+------------------------- BEGIN HEADERS -----------------------------
+Return-Path: %s
+[%H
+]\
+-------------------------- END HEADERS ------------------------------
diff --git a/conf/templates/amavisd.conf.template b/conf/templates/amavisd.conf.template
index 4a2ea01..7b3fb8e 100644
--- a/conf/templates/amavisd.conf.template
+++ b/conf/templates/amavisd.conf.template
@@ -330,7 +330,7 @@ $log_templ = '[? %#V |[? %#F |[?%#D|Not-Delivered|Passed]|BANNED name/type (%F)]
 # If notification template files are collectively available in some directory,
 # use read_l10n_templates which calls read_text for each known template.
 #
-#   read_l10n_templates('/etc/amavis/en_US');
+read_l10n_templates('@l_prefix@/etc/amavisd/templates/en_US');
 
 
 # Here is an overall picture (sequence of events) of how pieces fit together
diff --git a/conf/templates/main.cf.template b/conf/templates/main.cf.template
index e3d1400..16e79ee 100644
--- a/conf/templates/main.cf.template
+++ b/conf/templates/main.cf.template
@@ -154,6 +154,7 @@ ldapdistlist_search_base = @@@user_dn_list@@@
 ldapdistlist_domain = $mydestination
 ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s))
 ldapdistlist_special_result_attribute = member
+ldapdistlist_exclude_internal = yes
 ldapdistlist_result_attribute = mail
 ldapdistlist_result_filter = %s
 ldapdistlist_search_timeout = 15