diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..cc67606
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true
+}
\ No newline at end of file
diff --git a/app/sos-milter.py b/app/sos-milter.py
index 3c036ba..2ee003f 100644
--- a/app/sos-milter.py
+++ b/app/sos-milter.py
@@ -189,17 +189,8 @@ class SOSMilter(Milter.Base):
             logging.info(self.mconn_id + '/' + self.queue_id + "/EOM " + 
               "5321_from_domain={0} (LDAP) has a broken SPF-record!".format(self.env_from_domain)
             )
-          ex = str(
-            "SPF-record (-all) of 5321_from_domain=" 
-            + self.env_from_domain + " does not permit us to relay this message!"
-          )
-          if g_milter_mode == 'test':
-            logging.info(self.mconn_id + '/' + self.queue_id + "/EOM " + ex)
             try:
-              self.addheader(
-                'X-SOS-Milter',
-                self.mconn_id + ' ' + self.env_from_domain + ': failed SPF-expectation'
-              )
+              self.addheader('X-SOS-Milter', 'failed SPF-expectation')
               logging.debug(self.mconn_id + '/' + self.queue_id + "/EOM " +
                 'test-mode: X-SOS-Milter header was added. '
               )
@@ -207,8 +198,14 @@ class SOSMilter(Milter.Base):
               logging.error(self.mconn_id + '/' + self.queue_id + "/EOM " + 
                 "addheader() failed: " + traceback.format_exc()
               )
-          else: 
-            logging.warning(self.mconn_id + '/' + self.queue_id + "/EOM " + ex)
+          ex = str(
+            " SPF-record (-all) of 5321_from_domain=" 
+            + self.env_from_domain + " does not permit us to relay this message!"
+          )
+          logging.info(self.mconn_id + '/' + self.queue_id + "/EOM " +
+            "mode=" + g_milter_mode + ' ' + ex
+          )
+          if g_milter_mode == 'reject': 
             self.setreply('550','5.7.1',
               self.mconn_id + ' ' + ex + ' ' + g_milter_reject_message
             )
diff --git a/tests/miltertest.lua b/tests/miltertest.lua
index 6e88002..cbf3c06 100644
--- a/tests/miltertest.lua
+++ b/tests/miltertest.lua
@@ -11,7 +11,7 @@ mt.set_timeout(3)
 
 -- 5321.FROM + MACROS
 mt.macro(conn, SMFIC_MAIL, "i", "test-id",'{rcpt_host}', "test.next-hostx")
-if mt.mailfrom(conn, "dominik@zwackl.def") ~= nil then
+if mt.mailfrom(conn, "dominik@dc-it-con.de") ~= nil then
   error "mt.mailfrom() failed"
 end
 if mt.getreply(conn) ~= SMFIR_CONTINUE then
@@ -40,7 +40,7 @@ end
 if not mt.eom_check(conn, MT_HDRADD, "X-SOS-Milter") then
   mt.echo("no header added")
 else
-  mt.echo("X-SOS-Milter header added -> test-mode")
+  mt.echo("X-SOS-Milter header added -> LDAP-Domain with broken SPF")
 end
 
 -- DISCONNECT