diff --git a/init.lua b/init.lua
index cf25a92..2646f98 100644
--- a/init.lua
+++ b/init.lua
@@ -21,7 +21,9 @@ mail = {
 		to = {},
 		cc = {},
 		bcc = {},
-		boxtab = {}
+		boxtab = {},
+		sortfield = {},
+		sortdirection = {}
 	},
 
 	message_drafts = {}
diff --git a/ui/events.lua b/ui/events.lua
index 2650603..85a7b14 100644
--- a/ui/events.lua
+++ b/ui/events.lua
@@ -24,19 +24,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 
     -- then sort them
 
-    if not sortfield then
-        local sortfield = fields.sortfield
-    end
-    if not sortdirection then
-        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 sortfield = fields.sortfield or mail.selected_idxs.sortfield[name] or "3"
+    local sortdirection = fields.sortdirection or mail.selected_idxs.sortdirection[name] or "1"
+    mail.selected_idxs.sortfield[name] = sortfield
+    mail.selected_idxs.sortdirection[name] = sortdirection
 
     local messagesInbox = mail.sort_messages(messagesInboxFiltered, sortfield, sortdirection, filter)
     local messagesSent = mail.sort_messages(messagesOutboxFiltered, sortfield, sortdirection, filter)
diff --git a/ui/inbox.lua b/ui/inbox.lua
index 400ce27..c5138ef 100644
--- a/ui/inbox.lua
+++ b/ui/inbox.lua
@@ -3,12 +3,8 @@ local S = minetest.get_translator("mail")
 
 
 function mail.show_inbox(name, sortfield, sortdirection, filter)
-    if not sortfield or sortfield == "" or sortfield == "0" then
-        sortfield = "3"
-    end
-    if not sortdirection or sortdirection == "" or sortdirection == "0" then
-        sortdirection = "1"
-    end
+    sortfield = sortfield or "3"
+    sortdirection = sortdirection or "1"
 
     if not filter then
         filter = ""
diff --git a/ui/outbox.lua b/ui/outbox.lua
index d7cb92b..c73d20f 100644
--- a/ui/outbox.lua
+++ b/ui/outbox.lua
@@ -3,12 +3,8 @@ local S = minetest.get_translator("mail")
 
 
 function mail.show_sent(name, sortfield, sortdirection, filter)
-    if not sortfield or sortfield == "" or sortfield == "0" then
-        sortfield = "3"
-    end
-    if not sortdirection or sortdirection == "" or sortdirection == "0" then
-        sortdirection = "1"
-    end
+    sortfield = sortfield or "3"
+    sortdirection = sortdirection or "1"
 
     if not filter then
         filter = ""