diff --git a/app/models/message.rb b/app/models/message.rb
index 4f2c0779..ef45538e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -37,7 +37,7 @@ class Message < ActiveRecord::Base
   # clean up the recipients_ids
   def before_validation_on_create
     self.recipients_ids = recipients_ids.uniq.reject { |id| id.blank? } unless recipients_ids.nil?
-    self.recipients_ids = User.all.collect(&:id) if sent_to_all == 1
+    self.recipients_ids = User.all.collect(&:id) if sent_to_all == "1"
   end
 
   def add_recipients(users)
diff --git a/app/views/layouts/_main_tabnav.html.erb b/app/views/layouts/_main_tabnav.html.erb
index f8b2ff38..feb2604e 100644
--- a/app/views/layouts/_main_tabnav.html.erb
+++ b/app/views/layouts/_main_tabnav.html.erb
@@ -1,18 +1,18 @@
 <%
   u = @current_user
   tabs = [
-      { :name => "Start", :url => root_path, :active => ["index", "messages", "home"],
+      { :name => "Start", :url => root_path, :active => ["index", "home"],
         :subnav => [
-          { :name => "Nachrichten", :url => "/messages"},
           { :name => "Meine Aufgaben", :url => "/home/tasks" },
           { :name => "Meine Bestellgruppe", :url => "/home/ordergroup"},
           { :name => "Mein Profil", :url => "/home/profile"}
         ]
       },
-      { :name => "Foodcoop", :url => "/foodcoop/members", :active => ["foodcoop", "tasks"],
+      { :name => "Foodcoop", :url => "/foodcoop/members", :active => ["foodcoop", "tasks", "messages"],
         :subnav => [
           { :name => "Mitglieder", :url => "/foodcoop/members"},
           { :name => "Abeitsgruppen", :url => "/foodcoop/workgroups"},
+          { :name => "Nachrichten", :url => "/messages"},
           { :name => "Aufgaben", :url => "/tasks"}
         ]
       },