diff --git a/Changelog.md b/Changelog.md
index 240155584..93f3a10b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,10 @@
 * Made loading of the configuration environment independent of Rails.
 * Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead.
 
+## Features
+
+* Add possibility to contact the administrator. [#3792](https://github.com/diaspora/diaspora/pull/3792)
+
 ## Bug Fixes
 
 * Force Typhoeus/cURL to use the CA bundle we query via the config. Also add a setting for extra verbose output.
diff --git a/app/assets/images/icons/mail.png b/app/assets/images/icons/mail.png
new file mode 100644
index 000000000..44b5eeea4
Binary files /dev/null and b/app/assets/images/icons/mail.png differ
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 565e15dcd..d40ea5818 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -81,3 +81,15 @@
       = t('aspects.index.keep_diaspora_running')
       %br
       = render 'shared/donatediaspora'
+
+- if AppConfig.admins.podmin_email.present?
+  .section
+    .title
+      = image_tag('icons/mail.png')
+      %h5
+        = t('aspects.index.help.any_problem')
+    .content
+      = t('aspects.index.help.contact_podmin')
+      %br
+      %br
+      = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
diff --git a/config/defaults.yml b/config/defaults.yml
index f75a930bf..a46a1a62b 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -85,6 +85,7 @@ defaults:
     message_bus_api_key:
   admins:
     account:
+    podmin_email:
     inline_resque_web: true
 
 development:
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index b44f9e22b..4e28d975c 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -282,6 +282,9 @@ configuration: ## Section
     ## admin contact is neeeded, much like the postmaster role in mail
     ## systems. Set only the username, NOT the full ID.
     #account: "podmaster"
+
+    ## E-Mail address users can contact the administrator
+    #podmin_email: 'podmin@example.org'
     
     ## Resque is the background processing system used by Diaspora
     ## Resque web is an admin tool for it. This settings decides whether
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 1c206b0f0..c0d6816f2 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -240,6 +240,9 @@ en:
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
         email_feedback: "%{link} your feedback, if you prefer"
         email_link: "Email"
+        any_problem: "Any Problem?"
+        contact_podmin: "Contact the administrator of your pod!"
+        mail_podmin: "Podmin E-Mail"
       cubbies:
         heading: "Connect to Cubbi.es"
         explanation: "Cubbi.es is the first Diaspora application under development."