diff --git a/qtc-net-client-2/Forms/DirectMessage.cs b/qtc-net-client-2/Forms/DirectMessage.cs
index 2f0a13b..8ef7e65 100644
--- a/qtc-net-client-2/Forms/DirectMessage.cs
+++ b/qtc-net-client-2/Forms/DirectMessage.cs
@@ -69,8 +69,8 @@ namespace qtc_net_client_2.Forms
                 if (!string.IsNullOrEmpty(rtxtChatbox.Text))
                 {
                     await _gatewayService.SendDirectMessageAsync(User, new QtCNETAPI.Models.Message { Content = rtxtChatbox.Text, AuthorId = _apiService.CurrentUser.Id });
-                    Messages.Add($"[{_apiService.CurrentUser.Username}] {rtxtChatbox.Text}\n");
-                    rtxtChatbox.Clear();
+                    BeginInvoke(delegate () { Messages.Add($"[{_apiService.CurrentUser.Username}] {rtxtChatbox.Text}\n"); });
+                    BeginInvoke(delegate () { rtxtChatbox.Clear(); });
                     AudioService.PlaySoundEffect("sndSendClick");
                 }
             }
@@ -92,14 +92,14 @@ namespace qtc_net_client_2.Forms
                     Invoke(delegate ()
                     {
                         var msg = e.NewItems.Cast<string>().FirstOrDefault();
-                        rtxtChat.AppendText(msg + Environment.NewLine);
+                        rtxtChat.AppendText(msg);
                         if (!msg!.Contains(_apiService.CurrentUser.Username)) AudioService.PlaySoundEffect("sndMessage");
                     });
                 }
                 else
                 {
                     var msg = e.NewItems.Cast<string>().FirstOrDefault();
-                    rtxtChat.AppendText(msg + Environment.NewLine);
+                    rtxtChat.AppendText(msg);
                     if (!msg!.Contains(_apiService.CurrentUser.Username)) AudioService.PlaySoundEffect("sndMessage");
                 }
             }
diff --git a/qtc-net-client-2/Forms/Profile.cs b/qtc-net-client-2/Forms/Profile.cs
index 6c1525a..29f044e 100644
--- a/qtc-net-client-2/Forms/Profile.cs
+++ b/qtc-net-client-2/Forms/Profile.cs
@@ -68,6 +68,7 @@ namespace qtc_net_client_2.Forms
                 btnMessage.Visible = false;
                 return; // do not run contact getting code
             }
+            else btnAddContact.Visible = true;
 
             var contactsResult = await _apiService.GetCurrentUserContacts();
             if (contactsResult.Success && contactsResult.Data != null)
@@ -87,6 +88,7 @@ namespace qtc_net_client_2.Forms
                                 btnCancelRequest.Visible = true;
                                 break;
                             case Contact.ContactStatus.Accepted:
+                                btnAddContact.Visible = true;
                                 btnAddContact.Enabled = true;
                                 btnAddContact.Image = Resources.RemoveContactIcon;
                                 btnAddContact.Click += btnAddContact_Click_Remove;
@@ -112,6 +114,7 @@ namespace qtc_net_client_2.Forms
                                 btnCancelRequest.Visible = false;
 
                                 btnAddContact.Visible = true;
+                                btnAddContact.Enabled = true;
                                 btnAddContact.Image = Resources.RemoveContactIcon;
                                 btnAddContact.Click += btnAddContact_Click_Remove;
                                 if (_userInformationDto.Status >= 1) btnMessage.Visible = true;
@@ -119,6 +122,11 @@ namespace qtc_net_client_2.Forms
                         }
                     }
                 }
+                else
+                {
+                    btnAddContact.Visible = true;
+                    btnAddContact.Click += btnAddContact_Click_Add;
+                }
             }
             else
             {