diff --git a/Core/Helpers/TraderHelper.cs b/Core/Helpers/TraderHelper.cs
index b7030489..76f7892f 100644
--- a/Core/Helpers/TraderHelper.cs
+++ b/Core/Helpers/TraderHelper.cs
@@ -306,9 +306,11 @@ public class TraderHelper
     /// </summary>
     /// <param name="traderEnumValue">The trader enum value to validate</param>
     /// <returns>The validated trader enum value as a string, or an empty string if invalid</returns>
-    public string GetValidTraderIdByEnumValue(object traderEnumValue) // TODO: param was Traders
+    public string GetValidTraderIdByEnumValue(string traderEnumValue) // TODO: param was Traders
     {
-        throw new NotImplementedException();
+        var traderId = _databaseService.GetTraders();
+        var id = traderId.FirstOrDefault(x => x.Value.Base.Nickname.ToLower() == traderEnumValue.ToLower()).Key;
+        return id;
     }
 
     /// <summary>
diff --git a/Core/Services/MailSendService.cs b/Core/Services/MailSendService.cs
index 1ff9588e..aa929b37 100644
--- a/Core/Services/MailSendService.cs
+++ b/Core/Services/MailSendService.cs
@@ -517,7 +517,7 @@ public class MailSendService
             throw new Exception(_localisationService.GetText("mail-unable_to_find_message_sender_by_id", messageDetails.Sender));
         
         // Does dialog exist
-        var senderDialog = dialogsInProfile[senderId];
+        var senderDialog = dialogsInProfile.FirstOrDefault(x => x.Key == senderId).Value;
         if (senderDialog is null)
         {
             // create if doesnt