diff --git a/templates/postfix/conf.d/relay_by_sender.j2 b/templates/postfix/conf.d/relay_by_sender.j2
index 3a6a616..0210fb6 100644
--- a/templates/postfix/conf.d/relay_by_sender.j2
+++ b/templates/postfix/conf.d/relay_by_sender.j2
@@ -1,9 +1,11 @@
-# {{ ansible_managed }}
-
-# http://www.postfix.org/postconf.5.html#sender_dependent_relayhost_maps
+### {{ ansible_managed }}
+### http://www.postfix.org/postconf.5.html#sender_dependent_relayhost_maps
 
 {% if postfix_relay_by_sender is defined %}
-{% for map in postfix_relay_by_sender %}
-{{ map }}
+{% for sender in postfix_relay_by_sender %}
+{% if sender.comment is defined %}
+# {{ sender.comment }}
+{% endif %}
+{{ "%-60s %s" | format(sender.name, domain.relay) }}
 {% endfor %}
 {% endif %}