diff --git a/ui/events.lua b/ui/events.lua
index e9ac755..2650603 100644
--- a/ui/events.lua
+++ b/ui/events.lua
@@ -24,13 +24,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 
     -- then sort them
 
-    if not fields.sortfield or fields.sortfield == "" then
-        sortfield = "3"
-    end
-    if not fields.sortdirection or fields.sortdirection == ""  then
-        sortdirection = "1"
-    end
-
     if not sortfield then
         local sortfield = fields.sortfield
     end
@@ -38,6 +31,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
         local sortdirection = fields.sortdirection
     end
 
+    if not fields.sortfield or fields.sortfield == "" then
+        sortfield = "3"
+    end
+    if not fields.sortdirection or fields.sortdirection == ""  then
+        sortdirection = "1"
+    end
+
     local messagesInbox = mail.sort_messages(messagesInboxFiltered, sortfield, sortdirection, filter)
     local messagesSent = mail.sort_messages(messagesOutboxFiltered, sortfield, sortdirection, filter)