diff --git a/message_handlers/rx_handler.py b/message_handlers/rx_handler.py
index 1104496..7c129a9 100644
--- a/message_handlers/rx_handler.py
+++ b/message_handlers/rx_handler.py
@@ -1,5 +1,5 @@
 from meshtastic import BROADCAST_NUM
-from utilities.utils import get_node_list, decimal_to_hex, get_nodeNum
+from utilities.utils import get_node_list, decimal_to_hex, get_nodeNum, get_name_from_number
 import globals
 from ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification
 from db_handler import save_message_to_db, maybe_store_nodeinfo_in_db
@@ -51,18 +51,12 @@ def on_receive(packet, interface):
 
             # Add received message to the messages list
             message_from_id = packet['from']
-            message_from_string = ""
-            for node in globals.interface.nodes.values():
-                if message_from_id == node['num']:
-                    message_from_string = node["user"]["shortName"] + ":" # Get the name using the node ID
-                    break
-                else:
-                    message_from_string = str(decimal_to_hex(message_from_id))  # If long name not found, use the ID as string
-        
-            if globals.channel_list[channel_number] in globals.all_messages:
-                globals.all_messages[globals.channel_list[channel_number]].append((f"{globals.message_prefix} {message_from_string} ", message_string))
-            else:
-                globals.all_messages[globals.channel_list[channel_number]] = [(f"{globals.message_prefix} {message_from_string} ", message_string)]
+            message_from_string = get_name_from_number(message_from_id, type='short') + ":"
+
+            if globals.channel_list[channel_number] not in globals.all_messages:
+                globals.all_messages[globals.channel_list[channel_number]] = []
+
+            globals.all_messages[globals.channel_list[channel_number]].append((f"{globals.message_prefix} {message_from_string} ", message_string))
 
             draw_channel_list()
             draw_messages_window()