--- usr/local/etc/drweb/drweb_qmail.conf.orig	Mon Nov 21 17:06:02 2005
+++ usr/local/etc/drweb/drweb_qmail.conf	Mon Nov 21 17:30:21 2005
@@ -353,9 +353,9 @@
 RcptsNotify = yes
 
 # Files with notification templates
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/virus-sender.msg
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/virus-admin.msg
-RcptsTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/virus-rcpts.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sender-virus.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-virus.msg
+RcptsTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/rcpts-virus.msg
 
 [MalwareNotifications]
 # Enable or disable sending notifications to persons (yes/no)
@@ -364,21 +364,21 @@
 RcptsNotify = yes
 
 # Files with notification templates
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/malware-sender.msg
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/malware-admin.msg
-RcptsTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/malware-rcpts.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sender-malware.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-malware.msg
+RcptsTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/rcpts-malware.msg
 
 [CuredNotifications]
 SenderNotify = yes
 AdminNotify = yes
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/cured-sender.msg
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/cured-admin.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sendercured.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-cured.msg
 
 [SkipNotifications]
 SenderNotify = yes
 AdminNotify = no
 RcptsNotify = no
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/skip-sender.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sender-skip.msg
 AdminTemplate = 
 RcptsTemplate = 
 
@@ -386,16 +386,16 @@
 SenderNotify = yes
 AdminNotify = yes
 RcptsNotify = no
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/archive-sender.msg
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/archive-admin.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sender-archive.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-archive.msg
 RcptsTemplate = 
 
 [ErrorNotifications]
 SenderNotify = yes
 AdminNotify = yes
 RcptsNotify = no
-SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/error-sender.msg
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/error-admin.msg
+SenderTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/sender-error.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-error.msg
 RcptsTemplate = 
 
 [RuleFilterNotifications]
@@ -403,12 +403,12 @@
 AdminNotify = yes
 RcptsNotify = no
 SenderTemplate = 
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/rule-admin.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-rule.msg
 RcptsTemplate = 
 
 [LicenseLimitNotifications]
 AdminNotify = yes
-AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/license-admin.msg
+AdminTemplate = /usr/local/etc/drweb/templates/en-ru/qmail/admin-license.msg
 
 ###################
 # Logging section #