diff --git a/app.rb b/app.rb
index 34974834..ffd2ddab 100644
--- a/app.rb
+++ b/app.rb
@@ -42,9 +42,7 @@ error do
     from: 'web@neocities.org',
     to: 'errors@neocities.org',
     subject: "[Neocities Error] #{env['sinatra.error'].class}: #{env['sinatra.error'].message}",
-    body: "#{request.request_method} #{request.path}\n\n" +
-          (current_site ? "Site: #{current_site.username}\nEmail: #{current_site.email}\n\n" : '') +
-          env['sinatra.error'].backtrace.join("\n")
+    body: erb(:'views/templates/email/error')
   })
 
   if @api
@@ -54,4 +52,4 @@ error do
   erb :'error'
 end
 
-Dir['./app/**/*.rb'].each {|f| require f}
\ No newline at end of file
+Dir['./app/**/*.rb'].each {|f| require f}
diff --git a/views/templates/email/error.erb b/views/templates/email/error.erb
new file mode 100644
index 00000000..8695db3c
--- /dev/null
+++ b/views/templates/email/error.erb
@@ -0,0 +1,12 @@
+<%= request.request_method %> <%= request.path %>
+
+<% if current_site %>
+  Site: <%= current_site.username %>
+  Email: <%= current_site.email %>
+<% end %>
+
+Params:
+<%= params.inspect %>
+
+Backtrace:
+<%= env['sinatra.error'].backtrace.join("\n") %>