diff --git a/app/controllers/feedback_controller.rb b/app/controllers/feedback_controller.rb
index cab491a9..2d596bc5 100644
--- a/app/controllers/feedback_controller.rb
+++ b/app/controllers/feedback_controller.rb
@@ -4,9 +4,9 @@ class FeedbackController < ApplicationController
   end
 
   def create
-    unless params[:message].blank?
-      Mailer.feedback(current_user, params[:message]).deliver
-      redirect_to new_feedback_url, :notice => 'The message was successfully delivered.'
+    if params[:message].present?
+      Mailer.feedback(FoodsoftConfig.scope, current_user, params[:message]).deliver
+      redirect_to root_url, :notice => "Das Feedback wurde erfolgreich verschickt. Vielen Dank!"
     else
       render :action => 'new'
     end
diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb
index 0f74bcd9..0dbec5e0 100644
--- a/app/mailers/mailer.rb
+++ b/app/mailers/mailer.rb
@@ -65,7 +65,8 @@ class Mailer < ActionMailer::Base
          :subject => "[#{FoodsoftConfig[:name]}] Gruppenkonto im Minus"
   end
 
-  def feedback(user, feedback)
+  def feedback(foodcoop, user, feedback)
+    set_foodcoop_scope(foodcoop)
     @user = user
     @feedback = feedback
 
diff --git a/app/views/feedback/new.html.haml b/app/views/feedback/new.html.haml
index a137cc90..98c4141a 100644
--- a/app/views/feedback/new.html.haml
+++ b/app/views/feedback/new.html.haml
@@ -1,6 +1,11 @@
-%h2 Fehler gefunden? Vorschlag? Idee? Kritik?
+- title "Gib Feedback"
+
+%p Fehler gefunden? Vorschlag? Idee? Kritik? Wir freuen uns über jegliches Feedback.
+%p
+  Bitte beachte, dass das Foodsoft Team nur die Software wartet. Bei Fragen zur Organisation in Deiner Foodcoop,
+  kontaktiere besser die entsprechenden Ansprechpartner.
 
 = form_tag feedback_path do
-  %p
-    = text_area_tag :message, nil, :size => "40x15"
-  = submit_tag "Absenden"
\ No newline at end of file
+  = text_area_tag :message, nil, class: 'input-xxlarge', rows: 10, required: 'required'
+  .form-actions
+    = submit_tag "Absenden", class: 'btn btn-primary'
\ No newline at end of file
diff --git a/app/views/mailer/feedback.text.haml b/app/views/mailer/feedback.text.haml
index c5e4c805..5760a065 100644
--- a/app/views/mailer/feedback.text.haml
+++ b/app/views/mailer/feedback.text.haml
@@ -1,4 +1,4 @@
 = @user.nick
 schrieb am #{I18n.l Time.now, :format => :short}:
 
-\#{@feedback}
+= @feedback
diff --git a/config/navigation.rb b/config/navigation.rb
index e8f66ec7..f4b3967a 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -51,7 +51,7 @@ SimpleNavigation::Configuration.run do |navigation|
       primary.item :homepage, FoodsoftConfig[:name], FoodsoftConfig[:homepage]
     end
     primary.item :help, 'Hilfe', 'https://github.com/bennibu/foodsoft/wiki/Doku', id: nil
-    primary.item :feedback, 'Feedback', 'new_feedback_path', title: "Fehler gefunden? Vorschlag? Idee? Kritik?", id: nil
+    primary.item :feedback, 'Feedback', new_feedback_path, title: "Fehler gefunden? Vorschlag? Idee? Kritik?", id: nil
     primary.item :nick, current_user.nick, '#' do |subnav|
       subnav.item :edit_profile, 'Profil bearbeiten', my_profile_path, title: 'Profil bearbeiten', id: nil
       subnav.item :logout, 'Abmelden', logout_path, id: nil