diff --git a/config/diaspora.toml.example b/config/diaspora.toml.example
index 95b5f60b5..453ec1aef 100644
--- a/config/diaspora.toml.example
+++ b/config/diaspora.toml.example
@@ -198,6 +198,69 @@
 ## increase environment.sidekiq.concurrency instead!
 #sidekiq_workers = 1
 
+## Diaspora has an internal XMPP web-client. If you want to enable the chat
+## functionality or want to use a custom XMPP server, then you should edit
+## the following configuration.
+## DEPRECATED: The chat suppport will be removed with Diaspora 0.8.0.0!
+[configuration.chat]
+
+## Enable the chat service and all its components.
+##
+## Please make sure that you followed the Installation-Instructions first:
+## https://wiki.diasporafoundation.org/Integration/Chat#Installation.2FUpdate
+#enabled = true
+
+## Custom XMPP server configuration goes here.
+[configuration.chat.server]
+
+## Use the configuration bridge to prosody (default=true).
+## In case you want to run your own server or want to configure
+## prosody on your own, you should disable it.
+#enabled =  false
+
+## Set the directory in which to look for virtual hosts TLS certificates.
+#certs = "config/certs"
+
+## XEP-0124 BOSH requests
+## The easiest way of avoiding certificate and mixed-content issues
+## is to use a proxy, e.g.:
+##
+## Apache: https://wiki.diasporafoundation.org/Integration/Chat#Apache2
+## Nginx: https://wiki.diasporafoundation.org/Integration/Chat#Nginx
+##
+## If you configured your proxy correctly,
+## you should set the proxy option to 'true'
+[configuration.chat.server.bosh]
+
+## If you'd like to use a proxy, you should set the proxy
+## option to true, otherwise jsxc always tries to
+## connect directly to the port specified below.
+#proxy = true
+
+## Configure the protocol used to access the BOSH endpoint
+#proto = "http"
+
+## Configure the address that prosody should listen on.
+#address = "0.0.0.0"
+
+## Configure the BOSH port.
+#port = 5280
+
+## Configure the bind endpoint.
+#bind = "/http-bind"
+
+## Specify chat server log behaviour here.
+[configuration.chat.server.log]
+
+## Log file location.
+#info = "log/prosody.log"
+
+## Error log file location.
+#error = "log/prosody.err"
+
+## The debug level logs all XML sent and received by the server.
+#debug = false
+
 ## Displays the location of a post in a map. Per default we are using the map
 ## tiles of the Heidelberg University (http://giscience.uni-hd.de).
 ## You also have the possibility to use the map tiles of https://www.mapbox.com