diff --git a/Wino.Core/Authenticators/GmailAuthenticator.cs b/Wino.Core/Authenticators/GmailAuthenticator.cs
index 9fe3aaa3..1e683de5 100644
--- a/Wino.Core/Authenticators/GmailAuthenticator.cs
+++ b/Wino.Core/Authenticators/GmailAuthenticator.cs
@@ -12,7 +12,7 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Authentication;
 using Wino.Core.Domain.Models.Authorization;
 using Wino.Core.Services;
-using Wino.Messaging.Server;
+using Wino.Messaging.UI;
 
 namespace Wino.Core.Authenticators
 {
diff --git a/Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs b/Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs
index cf043a9b..47bf6e51 100644
--- a/Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/AccountCreationDialog.xaml.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
 using Wino.Core.Domain.Interfaces;
-using Wino.Messaging.Server;
+using Wino.Messaging.UI;
 
 namespace Wino.Dialogs
 {
diff --git a/Wino.Messages/Server/CopyAuthURLRequested.cs b/Wino.Messages/UI/CopyAuthURLRequested.cs
similarity index 81%
rename from Wino.Messages/Server/CopyAuthURLRequested.cs
rename to Wino.Messages/UI/CopyAuthURLRequested.cs
index 75979881..7745adb1 100644
--- a/Wino.Messages/Server/CopyAuthURLRequested.cs
+++ b/Wino.Messages/UI/CopyAuthURLRequested.cs
@@ -1,6 +1,4 @@
-using Wino.Messaging.UI;
-
-namespace Wino.Messaging.Server
+namespace Wino.Messaging.UI
 {
     /// <summary>
     /// When authenticators are proposed to copy the auth URL on the UI.