diff --git a/templates/mail_processor.conf.j2 b/templates/mail_processor.conf.j2
index e6c260e..ab9d6f3 100644
--- a/templates/mail_processor.conf.j2
+++ b/templates/mail_processor.conf.j2
@@ -1,9 +1,9 @@
-disclaimers_folder={{ disclaimers_folder }}
-database_username={{ mailprocessor_database_username }}
-database_userpass={{ mailprocessor_database_password }}
-database_server={{ mailprocessor_database_server }}
-database_server_port={{ mailprocessor_database_server_port }}
-database_socket_file={{ mailprocessor_database_socket_file }}
-default_text_disclaimer_file={{ default_text_disclaimer_file }}
-default_html_disclaimer_file={{ default_html_disclaimer_file }}
-log_file={{ mailprocessor_log_file }}
+disclaimers_folder="{{ disclaimers_folder }}"
+database_username="{{ mailprocessor_database_username }}"
+database_userpass="{{ mailprocessor_database_password }}"
+database_server="{{ mailprocessor_database_server }}"
+database_server_port="{{ mailprocessor_database_server_port }}"
+database_socket_file="{{ mailprocessor_database_socket_file }}"
+default_text_disclaimer_file="{{ default_text_disclaimer_file }}"
+default_html_disclaimer_file="{{ default_html_disclaimer_file }}"
+log_file="{{ mailprocessor_log_file }}"