diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb
index 6065b96..a10e2b6 100644
--- a/app/controllers/emails_controller.rb
+++ b/app/controllers/emails_controller.rb
@@ -5,14 +5,18 @@ before_filter :authorize
     
   end
   def daily_reminder
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port 
     @mail =NewsMailer.daily_reminder(current_user.id)
     if params[:send]
-      @mail.deliver
+      usr=User.where(:flag_getemails => true)
+      usr.each do |u|
+        NewsMailer.daily_reminder(current_user.id).deliver
+      end
     end
-      render layout: false
+    render layout: false
 end
-protected
+  protected
   def authorize
-    authorize! :emails,User
+    authorize! :emails, User
   end
 end
diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 4c117d3..6410924 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -119,12 +119,15 @@ end
     end  
   end
   def mail_preview
+  ActionMailer::Base.default_url_options[:host] = request.host_with_port 
+
     @neuigkeit = Neuigkeit.find(params[:id])
-   @user=current_user
+    @user=current_user
     @ability=Ability.new(@user)
+    @mail = NewsMailer.neuigkeit_mail("all@fet.at", params[:id])
 
     authorize! :publish, @neuigkeit
-    render template: "news_mailer/neuigkeit_mail", layout: false
+    render  layout: false
   end
   def newsletter_preview
     authorize! :publish, Neuigkeit
diff --git a/app/views/neuigkeiten/mail_preview.html.erb b/app/views/neuigkeiten/mail_preview.html.erb
new file mode 100644
index 0000000..31ad38f
--- /dev/null
+++ b/app/views/neuigkeiten/mail_preview.html.erb
@@ -0,0 +1,5 @@
+<%= link_to "send", mail_preview_rubrik_neuigkeit_path(@neuigkeit) %>
+<%= raw(@mail.subject) %>
+
+<hr />
+<%= raw(@mail.body) %>
diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
index eb81f26..a0b1f9d 100644
--- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
@@ -27,7 +27,7 @@
 					<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? 
 					%>
 					
-					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? 
+					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_preview_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published? 
 					%>
 				</ul>
 			</div>