diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -16,30 +16,55 @@ debug = true
 pdebug = false
 
 ################################################################################
-## Uncomment and replace with the address which should receive                ##
-## any error reports after application crash                                  ##
-## Additionally those settings will be used by Kallithea mailing system       ##
+## E-mail settings                                                            ##
+##                                                                            ##
+## Refer to the documentation ("E-mail settings") for more details.           ##
+##                                                                            ##
+## It is recommended to use a valid sender address that passes access         ##
+## validation and spam filtering in mail servers.                             ##
 ################################################################################
+
+## 'From' header for application e-mails. You can optionally add a name.
+## Default:
 #app_email_from = Kallithea
+## Examples:
 #app_email_from = Kallithea <kallithea-noreply@example.com>
 #app_email_from = kallithea-noreply@example.com
+
+## Subject prefix for application e-mails.
+## A space between this prefix and the real subject is automatically added.
+## Default:
 #email_prefix =
+## Example:
 #email_prefix = [Kallithea]
 
-#email_to = admin@localhost
+## Recipients for error e-mails and fallback recipients of application mails.
+## Multiple addresses can be specified, space-separated.
+## Only addresses are allowed, do not add any name part.
+## Default:
+#email_to =
+## Examples:
 #email_to = admin@example.com
 #email_to = admin@example.com another_admin@example.com
+
+## 'From' header for error e-mails. You can optionally add a name.
+## Default:
 #error_email_from = pylons@yourapp.com
+## Examples:
 #error_email_from = Kallithea Errors <kallithea-noreply@example.com>
 #error_email_from = paste_error@example.com
 
+## SMTP server settings
+## Only smtp_server is mandatory. All other settings take the specified default
+## values.
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port = 25
 #smtp_use_tls = false
 #smtp_use_ssl = false
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## SMTP authentication parameters to use (e.g. LOGIN PLAIN CRAM-MD5, etc.).
+## If empty, use any of the authentication parameters supported by the server.
 #smtp_auth =
 
 [server:main]