diff --git a/responders/Mailer/mailer.py b/responders/Mailer/mailer.py
index d238d2b4a..331eb5af4 100755
--- a/responders/Mailer/mailer.py
+++ b/responders/Mailer/mailer.py
@@ -40,7 +40,7 @@ def run(self):
tags = self.get_param(
"data.tags", None, "recipient address not found in tags"
)
- mail_tags = [t[5:] for t in tags if t.startswith("mail:")]
+ mail_tags = [t[6:-1] for t in tags if t.startswith("mail=")]
if mail_tags:
mail_to = mail_tags.pop()
else:
diff --git a/thehive-templates/AnyRun_Sandbox_1_0/long.html b/thehive-templates/AnyRun_Sandbox_Analysis_1_0/long.html
similarity index 98%
rename from thehive-templates/AnyRun_Sandbox_1_0/long.html
rename to thehive-templates/AnyRun_Sandbox_Analysis_1_0/long.html
index 741127bba..a76be43ef 100644
--- a/thehive-templates/AnyRun_Sandbox_1_0/long.html
+++ b/thehive-templates/AnyRun_Sandbox_Analysis_1_0/long.html
@@ -1,132 +1,132 @@
-
\ No newline at end of file
diff --git a/thehive-templates/AnyRun_Sandbox_1_0/short.html b/thehive-templates/AnyRun_Sandbox_Analysis_1_0/short.html
similarity index 98%
rename from thehive-templates/AnyRun_Sandbox_1_0/short.html
rename to thehive-templates/AnyRun_Sandbox_Analysis_1_0/short.html
index 96eef2a47..3dfae10bf 100644
--- a/thehive-templates/AnyRun_Sandbox_1_0/short.html
+++ b/thehive-templates/AnyRun_Sandbox_Analysis_1_0/short.html
@@ -1,3 +1,3 @@
-
- {{t.namespace}}:{{t.predicate}}="{{t.value}}"
-
+
+ {{t.namespace}}:{{t.predicate}}="{{t.value}}"
+