new_hdrs = ["user-agent", "x-mailer", "x-spam-status"].map do |key|
  data = message.raw_header.slice(Regexp.new("#{key}.*$", true))
  data ?  "   #{data}" : nil
end

dft_hdrs + new_hdrs.compact