reorzanize collecting template data

Author: Lukas-Heindl

intelmq/bots/outputs/smtp_batch/output.py

@@ -330,16 +330,18 @@ def prepare_mails(self) -> Iterable[Mail]:
 
             # collect all data which must be the same for all events of the
             # bucket and thus can be used for templating
-            template_data = {}
-            # only collect if templating is enabled (save the memory otherwise)
+            template_keys = ['source.abuse_contact']
+            # only collect if templating is enabled (save the memory otherwise)+
             if jinja2 and self.templating and any(self.templating.values()):
-                template_data = {
-                    k.replace(".", "_"): lines[0][k]
-                    for k in ["source.abuse_contact"] + self.additional_grouping_keys
-                    if k in rows_output[0]
-                }
+                template_keys.extend(self.additional_grouping_keys)
 
-            email_to = template_data["source_abuse_contact"]
+            template_data = {
+                k.replace(".", "_"): lines[0][k]
+                for k in template_keys
+                if k in rows_output[0]
+            }
+
+            email_to = template_data["source.abuse_contact"]
             filename = f'{time.strftime("%y%m%d")}_{count}_events'
             path = NamedTemporaryFile().name