diff --git a/frontend.py b/frontend.py
index 969bea6..d53bd28 100755
--- a/frontend.py
+++ b/frontend.py
@@ -87,6 +87,18 @@ def city_page(city):
     return dict(info='There is no Ticketfrei bot in your city yet. Create one yourself!')
 
 
+@get('/city/mail/<city>')
+@view('template/mail.tpl')
+def display_mail_page(city, user):
+    return user.state()
+
+
+@post('/city/mail/submit/<city>')
+def subscribe_mail(user, city):
+    email = request.forms['mailaddress']
+    redirect('/city/' + city)
+
+
 @get('/settings')
 @view('template/settings.tpl')
 def settings(user):
diff --git a/template/mail.tpl b/template/mail.tpl
index 2813e17..2b16981 100644
--- a/template/mail.tpl
+++ b/template/mail.tpl
@@ -6,7 +6,7 @@ import markdown as md
 html = md.markdown(markdown)
 %>
 
-<form action="/city/mail/<% print(city) %>" method="post">
+<form action="/city/mail/submit/<% print(city) %>" method="post">
     <input type="text" name="mailaddress" placeholder="E-Mail address" id="mailaddress">
     <input name='confirm' value='Subscribe to E-Mail notifications' type='submit'/>
 </form>