X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6adf8fe384453f2da9a9f5b8eefe2cf2b3de63e2..3c79240a6ab23e4103826dd1cec7a12a19e948db:/app/models/user.rb?ds=sidebyside

diff --git a/app/models/user.rb b/app/models/user.rb
index 054695e5b..908ef3d51 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,8 +3,8 @@ class User < ActiveRecord::Base
 
   has_many :traces
   has_many :diary_entries, :order => 'created_at DESC'
-  has_many :messages, :foreign_key => :to_user_id
-  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0"
+  has_many :messages, :foreign_key => :to_user_id, :order => 'sent_on DESC'
+  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => "message_read = 0", :order => 'sent_on DESC'
   has_many :friends
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"