diff --git a/tabellio/config/controlpanel.pt b/tabellio/config/controlpanel.pt
index f9a9a92..dc8364f 100644
--- a/tabellio/config/controlpanel.pt
+++ b/tabellio/config/controlpanel.pt
@@ -355,6 +355,7 @@
                         />
                 </div>
 
+                <hr/>
                 <div
                     tal:define="error errors/audiofiles_path | nothing;
                                 audiofiles_path python:request.get('audiofiles_path', view.settings.audiofiles_path)"
@@ -387,6 +388,40 @@
                         >...</textarea>
                 </div>
 
+                <hr/>
+                <div
+                    tal:define="error errors/contest_subject_email | nothing;
+                                contest_subject_email python:request.get('contest_subject_email', view.settings.contest_subject_email)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="contest_subject_email" i18n:translate="label_contest_subject_email">Contest Subject Email</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="contest_subject_email"
+                        id="contest_subject_email"
+                        type="text"
+                        tal:attributes="value contest_subject_email"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/contest_subject_body | nothing;
+                                contest_body_email python:request.get('contest_body_email', view.settings.contest_body_email)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="contest_body_email" i18n:translate="label_contest_body_email">Contest Body Email</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <textarea
+                        name="contest_body_email"
+                        id="contest_body_email"
+                        type="text"
+                        rows="20"
+                        cols="80"
+                        tal:content="contest_body_email"
+                        >...</textarea>
+                </div>
+
+
                 <div class="formControls">
                     <input
                         type="submit"
diff --git a/tabellio/config/controlpanel.py b/tabellio/config/controlpanel.py
index 3023ba0..43e14c8 100644
--- a/tabellio/config/controlpanel.py
+++ b/tabellio/config/controlpanel.py
@@ -93,6 +93,8 @@ class TabellioControlpanel(BrowserView):
             self.settings.ical_password = form.get('ical_password')
             self.settings.audiofiles_path = form.get('audiofiles_path')
             self.settings.commission_audio_codes = form.get('commission_audio_codes')
+            self.settings.contest_subject_email = form.get('contest_subject_email')
+            self.settings.contest_body_email = form.get('contest_body_email')
 
         if submitted and not self.errors:
             self._setup()
diff --git a/tabellio/config/interfaces.py b/tabellio/config/interfaces.py
index ddba358..9ecc83a 100644
--- a/tabellio/config/interfaces.py
+++ b/tabellio/config/interfaces.py
@@ -75,3 +75,9 @@ class ITabellioSettings(Interface):
         required=False)
 
     commission_audio_codes = schema.Text(title=_(u'Commission Audio Codes'), required=False)
+
+    contest_subject_email = schema.TextLine(
+        title=_(u'Contest Subject Email'),
+        required=False)
+
+    contest_body_email = schema.Text(title=_(u'Contest Subject Email'), required=False)