diff --git a/templates/default/aliases.erb b/templates/default/aliases.erb
index 58e5031..3093154 100644
--- a/templates/default/aliases.erb
+++ b/templates/default/aliases.erb
@@ -6,5 +6,5 @@
 postmaster:    root
 
 <% node['postfix']['aliases'].each do |name, value| %>
-<%= name %>: <%= [value].flatten.map{|x| %Q("#{x}")}.join(', ') %>
+<%= name %>: <%= [value].flatten.map{|x| if (x.include?("@")) then x else %Q("#{x}") end}.join(', ') %>
 <% end unless node['postfix']['aliases'].nil? %>