diff --git a/Rnwood.Smtp4dev.Tests/Controllers/MessagesControllerTests.cs b/Rnwood.Smtp4dev.Tests/Controllers/MessagesControllerTests.cs
index 22e6508d5..4c8a6323f 100644
--- a/Rnwood.Smtp4dev.Tests/Controllers/MessagesControllerTests.cs
+++ b/Rnwood.Smtp4dev.Tests/Controllers/MessagesControllerTests.cs
@@ -17,6 +17,7 @@
 using Rnwood.Smtp4dev.Hubs;
 using Rnwood.Smtp4dev.Tests.DBMigrations.Helpers;
 using Xunit;
+using Rnwood.Smtp4dev.Server.Settings;
 
 namespace Rnwood.Smtp4dev.Tests.Controllers
 {
@@ -128,6 +129,8 @@ public async Task GetMessage_ValidMime()
             IMessage message = await memoryMessageBuilder.ToMessage();
 
             var dbMessage = await new MessageConverter().ConvertAsync(message);
+            dbMessage.Mailbox = new DbModel.Mailbox { Name = MailboxOptions.DEFAULTNAME };
+          
             return dbMessage;
         }
 
diff --git a/Rnwood.Smtp4dev.Tests/Controllers/RelayMessageTests.cs b/Rnwood.Smtp4dev.Tests/Controllers/RelayMessageTests.cs
index e311beb1e..2b6812f39 100644
--- a/Rnwood.Smtp4dev.Tests/Controllers/RelayMessageTests.cs
+++ b/Rnwood.Smtp4dev.Tests/Controllers/RelayMessageTests.cs
@@ -32,7 +32,7 @@ public RelayMessagesTests()
             var sqlLiteForTesting = new SqliteInMemory();
             context = new Smtp4devDbContext(sqlLiteForTesting.ContextOptions);
             InitRepo();
-            messagesRepository.GetMessages(Arg.Any<bool>())
+            messagesRepository.GetMessages(Arg.Any<string>(), Arg.Any<bool>())
                 .Returns(context.Messages);
                             messagesRepository.TryGetMessageById(Arg.Any<Guid>(), Arg.Any<bool>())
   
diff --git a/Rnwood.Smtp4dev.Tests/TestMessagesRepository.cs b/Rnwood.Smtp4dev.Tests/TestMessagesRepository.cs
index 9c2cb12b7..b0d921dac 100644
--- a/Rnwood.Smtp4dev.Tests/TestMessagesRepository.cs
+++ b/Rnwood.Smtp4dev.Tests/TestMessagesRepository.cs
@@ -16,7 +16,7 @@ public TestMessagesRepository(params Message[] messages)
 
         public List<DbModel.Message> Messages { get; } = new List<Message>();
 
-        public Task DeleteAllMessages()
+        public Task DeleteAllMessages(string mailboxName)
         {
             Messages.Clear();
             return Task.CompletedTask;
@@ -30,12 +30,17 @@ public Task DeleteMessage(Guid id)
             return Task.CompletedTask;
         }
 
-        public IQueryable<Message> GetMessages(bool unTracked = true)
+        public IQueryable<Message> GetAllMessages(bool unTracked = true)
         {
             return Messages.AsQueryable();
         }
 
-        public Task MarkAllMessagesRead()
+        public IQueryable<Message> GetMessages(string mailboxName, bool unTracked = true)
+        {
+            return Messages.AsQueryable();
+        }
+
+        public Task MarkAllMessagesRead(string mailboxName)
         {
             foreach (var msg in Messages)
             {
diff --git a/Rnwood.Smtp4dev/ApiModel/Server.cs b/Rnwood.Smtp4dev/ApiModel/Server.cs
index 4e9b063d0..58b688b03 100644
--- a/Rnwood.Smtp4dev/ApiModel/Server.cs
+++ b/Rnwood.Smtp4dev/ApiModel/Server.cs
@@ -36,7 +36,9 @@ public class Server
         public string RecipientValidationExpression { get; set; }
         public string MessageValidationExpression { get; set; }
 		public bool DisableIPv6 { get; set; }
-        public User[] Users { get; set; }
+        public UserOptions[] Users { get; set; }
+
+        public MailboxOptions[] Mailboxes { get; set; }
 
         public string RelaySmtpServer { get; set; }
 
@@ -59,6 +61,10 @@ public class Server
 
         public string[] SmtpEnabledAuthTypesWhenSecureConnection { get; set; }
         public string[] SmtpEnabledAuthTypesWhenNotSecureConnection { get; set; }
+
+        public string CurrentUserName { get; set; }
+
+        public string CurrentUserDefaultMailboxName { get; set; }
     }
 
 }
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Mailbox.ts b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Mailbox.ts
new file mode 100644
index 000000000..e3ba99d5a
--- /dev/null
+++ b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Mailbox.ts
@@ -0,0 +1,13 @@
+
+export default class Mailbox {
+    name: string;
+    recipients: string;
+ 
+    constructor(name: string, recipients: string) {
+         
+        this.name = name;
+        this.recipients = recipients;
+    }
+
+
+}
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MailboxesController.ts b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MailboxesController.ts
new file mode 100644
index 000000000..2936cc7be
--- /dev/null
+++ b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MailboxesController.ts
@@ -0,0 +1,15 @@
+import axios from "axios";
+import Mailbox from "./Mailbox";
+
+export default class MailboxesController {
+    constructor() {}
+
+    public getAll_url(): string {
+        return `api/Mailboxes`;
+    }
+
+    public async getAll(): Promise<Mailbox[]> {
+        return (await axios.get(this.getAll_url(), null || undefined))
+            .data as Mailbox[];
+    }
+}
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MessagesController.ts b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MessagesController.ts
index ba2a9e41f..4891f5cec 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MessagesController.ts
+++ b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/MessagesController.ts
@@ -12,22 +12,22 @@ export default class MessagesController {
 
     private apiBaseUrl = `api/Messages`;
 
-    public getNewSummaries_url(lastSeenMessageId: string|null, pageSize: number = 50): string {
-        return `${this.apiBaseUrl}/new?lastSeenMessageId=${encodeURIComponent(lastSeenMessageId ?? "")}&pageSize=${pageSize}`;
+    public getNewSummaries_url(lastSeenMessageId: string | null, mailboxName: string, pageSize: number = 50): string {
+        return `${this.apiBaseUrl}/new?mailboxName=${mailboxName}&lastSeenMessageId=${encodeURIComponent(lastSeenMessageId ?? "")}&pageSize=${pageSize}`;
     }
 
-    public async getNewSummaries(lastSeenMessageId: string|null, pageSize: number = 50): Promise<MessageSummary[]> {
+    public async getNewSummaries(lastSeenMessageId: string|null, mailboxName: string, pageSize: number = 50): Promise<MessageSummary[]> {
 
-        return (await axios.get(this.getNewSummaries_url(lastSeenMessageId, pageSize), null || undefined)).data as MessageSummary[];
+        return (await axios.get(this.getNewSummaries_url(lastSeenMessageId, mailboxName, pageSize), null || undefined)).data as MessageSummary[];
     }
 
-    public getSummaries_url(searchTerms: string, sortColumn: string, sortIsDescending: boolean, page: number = 1, pageSize: number = 25): string {
-        return `${this.apiBaseUrl}?searchTerms=${encodeURIComponent(searchTerms)}&sortColumn=${encodeURIComponent(sortColumn)}&sortIsDescending=${sortIsDescending}&page=${page}&pageSize=${pageSize}`;
+    public getSummaries_url(mailboxName: string, searchTerms: string, sortColumn: string, sortIsDescending: boolean, page: number = 1, pageSize: number = 25): string {
+        return `${this.apiBaseUrl}?mailboxName=${encodeURIComponent(mailboxName)}&searchTerms=${encodeURIComponent(searchTerms)}&sortColumn=${encodeURIComponent(sortColumn)}&sortIsDescending=${sortIsDescending}&page=${page}&pageSize=${pageSize}`;
     }
 
-    public async getSummaries(searchTerms: string, sortColumn: string, sortIsDescending: boolean, page: number = 1, pageSize: number = 25): Promise<PagedResult<MessageSummary>> {
+    public async getSummaries(mailboxName: string, searchTerms: string, sortColumn: string, sortIsDescending: boolean, page: number = 1, pageSize: number = 25): Promise<PagedResult<MessageSummary>> {
 
-        return (await axios.get(this.getSummaries_url(searchTerms, sortColumn, sortIsDescending, page, pageSize), null || undefined)).data as PagedResult<MessageSummary>;
+        return (await axios.get(this.getSummaries_url(mailboxName, searchTerms, sortColumn, sortIsDescending, page, pageSize), null || undefined)).data as PagedResult<MessageSummary>;
     }
 
     // get: api/Messages/${encodeURIComponent(id)}  
@@ -50,8 +50,8 @@ export default class MessagesController {
         return (await axios.post(this.markMessageRead_url(id), null || undefined)).data as void;
     }
 
-    public async markAllMessageRead(): Promise<void> {
-        return await axios.post(`${this.apiBaseUrl}/markAllRead`);
+    public async markAllMessageRead(mailboxName: string): Promise<void> {
+        return await axios.post(`${this.apiBaseUrl}/markAllRead?mailboxName=${encodeURIComponent(mailboxName)}`);
     }
 
     // get: api/Messages/${encodeURIComponent(id)}/download  
@@ -155,12 +155,12 @@ export default class MessagesController {
     }
 
     // delete: api/Messages/*  
-    public deleteAll_url(): string {
-        return `${this.apiBaseUrl}/*`;
+    public deleteAll_url(mailboxName: string): string {
+        return `${this.apiBaseUrl}/*?mailboxName=${encodeURIComponent(mailboxName)}`;
     }
 
-    public async deleteAll(): Promise<void> {
+    public async deleteAll(mailboxName: string): Promise<void> {
 
-        return (await axios.delete(this.deleteAll_url(), null || undefined)).data as void;
+        return (await axios.delete(this.deleteAll_url(mailboxName), null || undefined)).data as void;
     }
 }
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Server.ts b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Server.ts
index d706d77d7..48327d5b6 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Server.ts
+++ b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Server.ts
@@ -1,15 +1,13 @@
 
+import Mailbox from './Mailbox';
 import User from './User';
 export default class Server {
-    webAuthenticationRequired: boolean;
-    smtpAllowAnyCredentials: boolean;
-    minimiseToTrayIcon: boolean;
-    isDesktopApp: boolean;
-    smtpEnabledAuthTypesWhenNotSecureConnection: string[];
-    smtpEnabledAuthTypesWhenSecureConnection: string[];
+    currentUserName: string;
+    currentUserDefaultMailboxName: string;
 
-    constructor(isRunning: boolean, exception: string, portNumber: number, hostName: string, allowRemoteConnections: boolean, numberOfMessagesToKeep: number, numberOfSessionsToKeep: number, imapPortNumber: number, settingsAreEditable: boolean, disableMessageSanitisation: boolean, automaticRelayExpression: string, tlsMode: string,     credentialsValidationExpression: string,
-    authenticationRequired: boolean,
+
+    constructor(isRunning: boolean, exception: string, portNumber: number, hostName: string, allowRemoteConnections: boolean, numberOfMessagesToKeep: number, numberOfSessionsToKeep: number, imapPortNumber: number, settingsAreEditable: boolean, disableMessageSanitisation: boolean, automaticRelayExpression: string, tlsMode: string, credentialsValidationExpression: string,
+        authenticationRequired: boolean,
         secureConnectionRequired: boolean, recipientValidationExpression: string, messageValidationExpression: string, disableIPv6: string, users: User[],
         relayTlsMode: string | undefined,
         relaySmtpServer: string,
@@ -18,23 +16,25 @@ export default class Server {
         relaySenderAddress: string,
         relayLogin: string,
         relayPassword: string,
-        webAuthenticationRequired : boolean,
-		smtpAllowAnyCredentials: boolean,
+        webAuthenticationRequired: boolean,
+        smtpAllowAnyCredentials: boolean,
         lockedSettings: { [key: string]: string },
         minimiseToTrayIcon: boolean,
         isDesktopApp: boolean,
         smtpEnabledAuthTypesWhenNotSecureConnection: string[],
-        smtpEnabledAuthTypesWhenSecureConnection: string[]
-    )
- {
-         
-        this.isRunning = isRunning; 
-        this.exception = exception; 
-        this.portNumber = portNumber; 
-        this.hostName = hostName; 
-        this.allowRemoteConnections = allowRemoteConnections; 
-        this.numberOfMessagesToKeep = numberOfMessagesToKeep; 
-        this.numberOfSessionsToKeep = numberOfSessionsToKeep; 
+        smtpEnabledAuthTypesWhenSecureConnection: string[],
+        mailboxes: Mailbox[],
+        currentUserName: string,
+        currentUserDefaultMailboxName: string
+    ) {
+
+        this.isRunning = isRunning;
+        this.exception = exception;
+        this.portNumber = portNumber;
+        this.hostName = hostName;
+        this.allowRemoteConnections = allowRemoteConnections;
+        this.numberOfMessagesToKeep = numberOfMessagesToKeep;
+        this.numberOfSessionsToKeep = numberOfSessionsToKeep;
         this.imapPortNumber = imapPortNumber;
         this.settingsAreEditable = settingsAreEditable;
         this.disableMessageSanitisation = disableMessageSanitisation;
@@ -56,22 +56,24 @@ export default class Server {
         this.relayPassword = relayPassword;
         this.lockedSettings = lockedSettings;
         this.webAuthenticationRequired = webAuthenticationRequired;
-		this.smtpAllowAnyCredentials = smtpAllowAnyCredentials;
+        this.smtpAllowAnyCredentials = smtpAllowAnyCredentials;
         this.minimiseToTrayIcon = minimiseToTrayIcon;
         this.isDesktopApp = isDesktopApp;
         this.smtpEnabledAuthTypesWhenNotSecureConnection = smtpEnabledAuthTypesWhenNotSecureConnection;
         this.smtpEnabledAuthTypesWhenSecureConnection = smtpEnabledAuthTypesWhenSecureConnection;
-
+        this.mailboxes = mailboxes;
+        this.currentUserName = currentUserName;
+        this.currentUserDefaultMailboxName = currentUserDefaultMailboxName;
     }
 
-     
-    isRunning: boolean; 
-    exception: string; 
-    portNumber: number; 
-    hostName: string; 
-    allowRemoteConnections: boolean; 
-    numberOfMessagesToKeep: number; 
-    numberOfSessionsToKeep: number; 
+
+    isRunning: boolean;
+    exception: string;
+    portNumber: number;
+    hostName: string;
+    allowRemoteConnections: boolean;
+    numberOfMessagesToKeep: number;
+    numberOfSessionsToKeep: number;
     imapPortNumber: number;
     settingsAreEditable: boolean;
     disableMessageSanitisation: boolean;
@@ -92,4 +94,11 @@ export default class Server {
     relayLogin: string;
     relayPassword: string;
     lockedSettings: { [key: string]: string };
+    webAuthenticationRequired: boolean;
+    smtpAllowAnyCredentials: boolean;
+    minimiseToTrayIcon: boolean;
+    isDesktopApp: boolean;
+    smtpEnabledAuthTypesWhenNotSecureConnection: string[];
+    smtpEnabledAuthTypesWhenSecureConnection: string[];
+    mailboxes: Mailbox[];
 }
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Template.tst b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Template.tst
deleted file mode 100644
index f17b61d60..000000000
--- a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/Template.tst
+++ /dev/null
@@ -1,62 +0,0 @@
-${
-    using Typewriter.Extensions.WebApi;
- 
-    string ReturnType(Method m) => m.Type.Name == "IActionResult" ? "void" : m.Type.Name;
-    string ParamType(Parameter p) => p.Type.Name.Replace("Delta<", "Partial<");
-    string ServiceName(Class c) => c.Name;
-     
-    string Imports(Class c){
-        List<string> neededImports = c.Properties
-	        .Where(p => !p.Type.IsPrimitive && p.Type.Name.TrimEnd('[',']')  != c.Name)
-	        .Select(p => "//" +  p.Type.Name + " from " + c.Name + "\nimport " + p.Type.Name.TrimEnd('[',']') + " from './" + p.Type.Name.TrimEnd('[',']') + "';").ToList();
-        if (c.BaseClass != null) { 
-	        neededImports.Add("import " + c.BaseClass.Name +" from './" + c.BaseClass.Name + "';");
-        }
-        return String.Join("\n", neededImports.Distinct());
-    }
-     
-    string ControllerImports(Class c){
-        List<string> returnTypeImports = c.Methods
-	        .Where(m => !m.Type.IsPrimitive && !m.Type.Name.Contains("void") && m.Type.Name != "IActionResult")
-	        .Select(p => "import " + p.Type.Name.TrimEnd('[',']') + " from './" + p.Type.Name.TrimEnd('[',']') + "';").ToList();
-
-        List<string> paramTypeImports = c.Methods
-            .SelectMany(m => m.Parameters)
-	        .Where(p => !p.Type.IsPrimitive)
-	        .Select(p => "import " + p.Type.Name.TrimEnd('[',']') + " from './" + p.Type.Name.TrimEnd('[',']') + "';").ToList();
-
-
-        return String.Join("\n", returnTypeImports.Concat(paramTypeImports).Distinct());
-    } 
-}
-$Classes(c => c.Namespace == "Rnwood.Smtp4dev.ApiModel")[$Imports
-export default class $Name$TypeParameters {
- 
-    constructor($Properties(p => !p.Attributes.Any(a => a.Name.Contains("JsonIgnoreAttribute")))[$name: $Type, ]) {
-        $Properties(p => !p.Attributes.Any(a => a.Name.Contains("JsonIgnoreAttribute")))[ 
-        this.$name = $name;]
-    }
-
-    $Properties(p => !p.Attributes.Any(a => a.Name.Contains("JsonIgnoreAttribute")))[ 
-    $name: $Type;]
-}]
-$Classes(*Controller)[$ControllerImports
-import axios from "axios";
-
-export default class $ServiceName {
-               
-    constructor(){
-    }
-        
-    $Methods[
-    
-    // $HttpMethod: $Url  
-    public $name_url($Parameters(p => p.Type.IsPrimitive)[$name: $Type][, ]): string {
-        return `$Url`;
-    }
-
-    public async $name($Parameters[$name: $ParamType][, ]): Promise<$ReturnType> {
-
-        return (await axios.$HttpMethod(this.$name_url($Parameters(p => p.Type.IsPrimitive)[$name][, ]), $RequestData || undefined)).data as $ReturnType;
-    }]
-}]
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/User.ts b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/User.ts
index fff177950..29ed3c889 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/ApiClient/User.ts
+++ b/Rnwood.Smtp4dev/ClientApp/src/ApiClient/User.ts
@@ -2,11 +2,13 @@
 export default class User {
     username: string;
     password: string;
+    defaultMailbox: string;
  
-    constructor(username: string, password: string) {
+    constructor(username: string, password: string, defaultMailbox: string) {
          
         this.username = username;
         this.password = password;
+        this.defaultMailbox = defaultMailbox;
     }
 
 
diff --git a/Rnwood.Smtp4dev/ClientApp/src/MessageNotificationManager.ts b/Rnwood.Smtp4dev/ClientApp/src/MessageNotificationManager.ts
index b75f6a777..f798688c1 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/MessageNotificationManager.ts
+++ b/Rnwood.Smtp4dev/ClientApp/src/MessageNotificationManager.ts
@@ -3,13 +3,15 @@ import { debounce } from 'ts-debounce';
 import MessagesController from "./ApiClient/MessagesController";
 
 export default class MessageNotificationManager {
-    constructor(onClick: (message: MessageSummary) => void) {
+    constructor(mailboxName: string|null, onClick: (message: MessageSummary) => void) {
         if (Notification.permission == "default") {
             Notification.requestPermission();
         }
+        this.mailboxName = mailboxName;
         this.onClick = onClick;
     }
 
+    private readonly mailboxName: string|null;
     private lastNotifiedMessage: MessageSummary | null = null;
     private onClick: (message: MessageSummary) => void;
     private visibleNotificationCloseTimeout: any | null = null;
@@ -20,8 +22,12 @@ export default class MessageNotificationManager {
     refresh = debounce(this.refreshInternal, 500);
     
     async refreshInternal(suppressNotifications: boolean) {
-        
-        const messagesByDate = await new MessagesController().getNewSummaries(this.lastNotifiedMessage?.id ?? "");
+
+        if (!this.mailboxName) {
+            return;
+        }
+
+        const messagesByDate = await new MessagesController().getNewSummaries(this.lastNotifiedMessage?.id ?? "", this.mailboxName);
         const messagesToAdd = messagesByDate.filter(m => !this.unnotifiedMessages.find(um => um.id=== m.id));
 
         
diff --git a/Rnwood.Smtp4dev/ClientApp/src/components/home/home.vue b/Rnwood.Smtp4dev/ClientApp/src/components/home/home.vue
index 5a4b4880f..e0e639da0 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/components/home/home.vue
+++ b/Rnwood.Smtp4dev/ClientApp/src/components/home/home.vue
@@ -1,6 +1,6 @@
 <template>
     <el-container class="fill hfillpanel">
-        <el-header height="35" style="display:flex; align-items: stretch; column-gap: 12px;">
+        <el-header height="35" style="display:flex; flex-wrap:wrap; align-items: end; column-gap: 12px;">
             <h1 style="flex: 0 0 content">
                 <a href="/~https://github.com/rnwood/smtp4dev/" target="_blank">
                     <img height="35" src="logo.png" alt="smtp4dev" />
@@ -9,11 +9,11 @@
 
             <VersionInfo style="flex: 1 1 content; align-self: center;"></VersionInfo>
 
-            <hubconnstatus style="flex: 0 1 content" :connection="connection"></hubconnstatus>
+            <hubconnstatus style="flex: 1 1 content" :connection="connection"></hubconnstatus>
             <serverstatus style="flex: 0 1 content" :connection="connection" v-on:showsettings="showSettings(true)">
             </serverstatus>
-            <el-dropdown trigger="click" @command="handleMenuCommand">
-                <el-button style="flex: 0 0 content; font-size: 1.7em; padding: 6px;" circle icon="more" />
+            <el-dropdown style="flex: 0 0 content;" trigger="click" @command="handleMenuCommand">
+                <el-button style="font-size: 1.7em; padding: 6px;" circle icon="more" />
 
                 <template #dropdown>
                     <el-dropdown-menu>
diff --git a/Rnwood.Smtp4dev/ClientApp/src/components/messagelist.vue b/Rnwood.Smtp4dev/ClientApp/src/components/messagelist.vue
index ae06c62f7..b01180995 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/components/messagelist.vue
+++ b/Rnwood.Smtp4dev/ClientApp/src/components/messagelist.vue
@@ -1,92 +1,115 @@
 <template>
     <div class="messagelist">
+   
         <div class="toolbar">
-            <el-button icon="close" title="Clear" @click="clear"></el-button>
-
-            <el-button icon="Delete"
-                       v-on:click="deleteSelected"
-                       :disabled="!selectedmessage"
-                       title="Delete"></el-button>
-            <el-button icon="refresh"
-                       v-on:click="refresh"
-                       :disabled="loading"
-                       title="Refresh"></el-button>
-            <el-button v-on:click="markAllMessageRead"
-                       :disabled="loading"
-                       title="Mark all as read">
-                <font-awesome-icon :icon="['fa-regular','envelope-open']" />
-            </el-button>
-
-            <el-button v-on:click="relaySelected"
-                       icon="d-arrow-right"
-                       :disabled="!selectedmessage || !isRelayAvailable"
-                       :loading="isRelayInProgress"
-                       title="Relay"></el-button>
-
-            <el-input v-model="searchTerm"
+
+            <el-button-group>
+                <el-button icon="Delete"
+                           v-on:click="deleteSelected"
+                           :disabled="!selectedmessage"
+                           title="Delete">Delete</el-button>
+
+                <el-button v-on:click="relaySelected"
+                           icon="d-arrow-right"
+                           :disabled="!selectedmessage || !isRelayAvailable"
+                           :loading="isRelayInProgress"
+                           title="Relay">Relay...</el-button>
+            </el-button-group>
+
+            <el-button-group>
+                <el-button icon="refresh"
+                           v-on:click="refresh"
+                           :disabled="loading || !selectedMailbox"
+                           title="Refresh"></el-button>
+                <el-button v-on:click="markAllMessageRead"
+                           :disabled="loading  || !selectedMailbox"
+                           title="Mark all as read">
+                    <font-awesome-icon :icon="['fa-regular','envelope-open']" />
+                </el-button>
+                <el-button icon="close" title="Clear" @click="clear"></el-button>
+            </el-button-group>
+
+
+            <el-select style="flex: 1 0 200px;" v-model="selectedMailbox" class="fill">
+                <el-option v-for="item in availableMailboxes"
+                           :key="item.name"
+                           :label="item.name"
+                           :value="item.name" />
+
+                <template #prefix>
+                    <el-icon><MessageBox /></el-icon>
+                </template>
+
+            </el-select>
+
+
+
+            <el-input class="fill"
+                      v-model="searchTerm"
                       clearable
                       placeholder="Search"
                       prefix-icon="search"
-                      style="float: right; width: 35%; min-width: 150px" />
+                      style="flex: 1 0 150px" />
+
         </div>
 
-        <el-alert v-if="error" type="error" title="Error" show-icon>
-            {{ error.message }}
-            <el-button v-on:click="refresh">Retry</el-button>
-        </el-alert>
-
-        <el-table :data="messages"
-                  v-loading="loading"
-                  :empty-text="emptyText"
-                  highlight-current-row
-                  @current-change="handleCurrentChange"
-                  @sort-change="sort"
-                  :default-sort="{ prop: 'receivedDate', order: 'descending' }"
-                  class="table"
-                  type="selection"
-                  reserve-selection="true"
-                  row-key="id"
-                  :row-class-name="getRowClass"
-                  ref="table"
-                  stripe>
-            <el-table-column property="receivedDate"
-                             label="Received"
-                             width="160"
-                             sortable="custom"
-                             :formatter="formatDate"></el-table-column>
-            <el-table-column property="from"
-                             label="From"
-                             width="140"
-                             sortable="custom"></el-table-column>
-            <el-table-column property="to"
-                             label="To"
-                             width="180"
-                             sortable="custom"
-                             :formatter="formatTo"></el-table-column>
-            <el-table-column property="isRelayed"
-                             label=""
-                             width="28">
-                <template #default="scope">
-
-                    <el-tooltip effect="light"
-                                content="Message has been relayed"
-                                placement="top-start">
-                        <span> <i v-if="scope.row.isRelayed" class="fas fa-share-square"></i></span>
-                    </el-tooltip>
-                </template>
-            </el-table-column>
-            <el-table-column property="subject" label="Subject" sortable="custom">
-                <template #default="scope">
-                    {{ scope.row.subject }}
-                    <i class="paperclip"
-                       v-if="scope.row.attachmentCount"
-                       :title="scope.row.attachmentCount + ' attachments'"></i>
-                </template>
-            </el-table-column>
-        </el-table>
-        <messagelistpager :paged-data="pagedServerMessages"
-                          @on-current-page-change="handlePaginationCurrentChange"
-                          @on-page-size-change="handlePaginationPageSizeChange"></messagelistpager>
+    <el-alert v-if="error" type="error" title="Error" show-icon>
+        {{ error.message }}
+        <el-button v-on:click="refresh">Retry</el-button>
+    </el-alert>
+
+    <el-table :data="messages"
+              v-loading="loading"
+              :empty-text="emptyText"
+              highlight-current-row
+              @current-change="handleCurrentChange"
+              @sort-change="sort"
+              :default-sort="{ prop: 'receivedDate', order: 'descending' }"
+              class="table"
+              type="selection"
+              reserve-selection="true"
+              row-key="id"
+              :row-class-name="getRowClass"
+              ref="table"
+              stripe>
+        <el-table-column property="receivedDate"
+                         label="Received"
+                         width="160"
+                         sortable="custom"
+                         :formatter="formatDate"></el-table-column>
+        <el-table-column property="from"
+                         label="From"
+                         width="140"
+                         sortable="custom"></el-table-column>
+        <el-table-column property="to"
+                         label="To"
+                         width="180"
+                         sortable="custom"
+                         :formatter="formatTo"></el-table-column>
+        <el-table-column property="isRelayed"
+                         label=""
+                         width="28">
+            <template #default="scope">
+
+                <el-tooltip effect="light"
+                            content="Message has been relayed"
+                            placement="top-start">
+                    <span> <i v-if="scope.row.isRelayed" class="fas fa-share-square"></i></span>
+                </el-tooltip>
+            </template>
+        </el-table-column>
+        <el-table-column property="subject" label="Subject" sortable="custom">
+            <template #default="scope">
+                {{ scope.row.subject }}
+                <i class="paperclip"
+                   v-if="scope.row.attachmentCount"
+                   :title="scope.row.attachmentCount + ' attachments'"></i>
+            </template>
+        </el-table-column>
+    </el-table>
+    <messagelistpager :paged-data="pagedServerMessages"
+                      @on-current-page-change="handlePaginationCurrentChange"
+                      @on-page-size-change="handlePaginationPageSizeChange"></messagelistpager>
     </div>
 </template>
 <script lang="ts">
@@ -102,13 +125,13 @@
     import { debounce } from "ts-debounce";
 
     import ConfirmationDialog from "@/components/confirmationdialog.vue";
-    import { MessageBoxInputData } from "element-plus/es/components/message-box";
     import ServerController from "../ApiClient/ServerController";
     import ClientSettingsController from "../ApiClient/ClientSettingsController";
 
-    import { mapOrder } from "@/components/utils/mapOrder";
     import PagedResult, { EmptyPagedResult } from "@/ApiClient/PagedResult";
     import Messagelistpager from "@/components/messagelistpager.vue";
+    import Mailbox from "../ApiClient/Mailbox";
+import MailboxesController from "../ApiClient/MailboxesController";
 
 
     @Component({
@@ -131,27 +154,32 @@
         connection: HubConnectionManager | null = null;
 
         messages: MessageSummary[] = [];
+        selectedMailbox: string | null = null;
 
         isRelayInProgress: boolean = false;
         isRelayAvailable: boolean = false;
 
         get emptyText() {
-            return this.loading ? "Loading..." : (this.searchTerm ?
-                `No messages matching '${this.searchTerm}'`
-                : "No messages");
+            if (this.loading) {
+                return "Loading";
+            }
+
+            if (!this.selectedMailbox) {
+                return "Select a mailbox to view messages";
+            }
+
+            return this.searchTerm ?
+                `No messages matching '${this.searchTerm}' in mailbox '${this.selectedMailbox}'`
+                : `No messages in mailbox '${this.selectedMailbox}'`;
         }
 
         error: Error | null = null;
         selectedmessage: MessageSummary | null = null;
         searchTerm: string = "";
         loading: boolean = true;
+        availableMailboxes: Mailbox[] | null = null;
 
-        private messageNotificationManager = new MessageNotificationManager(
-            (message) => {
-                this.selectMessage(message);
-                this.handleCurrentChange(message);
-            }
-        );
+        private messageNotificationManager: MessageNotificationManager | null = null;
 
         selectMessage(message: MessageSummary) {
             (this.$refs.table as TableInstance).setCurrentRow(message);
@@ -261,7 +289,7 @@
         async clear() {
 
             try {
-                await ElMessageBox.confirm("Delete all messages?")
+                await ElMessageBox.confirm(`Delete all messages in mailbox '${this.selectedMailbox}'?`)
             } catch {
                 return;
             }
@@ -269,11 +297,11 @@
 
             try {
                 this.loading = true;
-                await new MessagesController().deleteAll();
+                await new MessagesController().deleteAll(this.selectedMailbox!);
                 await this.refresh(true);
             } catch (e: any) {
                 ElNotification.error({
-                    title: "Clear Messages Failed",
+                    title: "Delete All Messages Failed",
                     message: e.message,
                 });
             } finally {
@@ -284,14 +312,26 @@
         @Watch("searchTerm")
         doSearch = debounce(() => this.refresh(false), 200);
 
+        @Watch("selectedMailbox")
+        async onMailboxChanged() {
+            this.initialMailboxLoadDone = false;
+            this.messageNotificationManager = new MessageNotificationManager(this.selectedMailbox,
+                (message) => {
+                    this.selectMessage(message);
+                    this.handleCurrentChange(message);
+                }
+            );
+            await this.refresh(true, false);
+        }
+
         private lastSort: string | null = null;
         private lastSortDescending: boolean = false;
         private mutex = new Mutex();
 
-        initialLoadDone = false;
+        initialMailboxLoadDone = false;
 
         async markAllMessageRead() {
-            await new MessagesController().markAllMessageRead();
+            await new MessagesController().markAllMessageRead(this.selectedMailbox!);
         }
 
         async refresh(includeNotifications: boolean, silent: boolean = false) {
@@ -302,18 +342,34 @@
                 this.loading = !silent;
                 this.error = null;
 
+                const server = await new ServerController().getServer()
+                this.isRelayAvailable = !!server.relaySmtpServer;
+
+                this.availableMailboxes = await new MailboxesController().getAll();
+                if (!this.selectedMailbox) {
+                    this.selectedMailbox = this.availableMailboxes.find(m => m.name == server.currentUserDefaultMailboxName)?.name ?? this.availableMailboxes[this.availableMailboxes.length - 1]?.name ?? null;
+                } else {
+                    //Potentially removed mailbox
+                    this.selectedMailbox = this.availableMailboxes.find(m => m.name == this.selectedMailbox)?.name ?? null;
+                }
 
                 // Copy in case they are mutated during the async load below
                 let sortColumn = this.selectedSortColumn;
                 let sortDescending = this.selectedSortDescending;
 
-                this.pagedServerMessages = await new MessagesController().getSummaries(
-                    this.searchTerm,
-                    sortColumn,
-                    sortDescending,
-                    this.page,
-                    this.pageSize
-                );
+                if (!this.selectedMailbox) {
+                    this.pagedServerMessages = { currentPage: 1, firstRowOnPage: 0, lastRowOnPage: 0, pageCount: 1, rowCount: 0, pageSize: this.pageSize, results: [] };
+                } else {
+
+                    this.pagedServerMessages = await new MessagesController().getSummaries(
+                        this.selectedMailbox,
+                        this.searchTerm,
+                        sortColumn,
+                        sortDescending,
+                        this.page,
+                        this.pageSize
+                    );
+                }
 
                 if (
                     !this.lastSort ||
@@ -339,15 +395,12 @@
                 }
 
                 if (includeNotifications) {
-                    await this.messageNotificationManager.refresh(!this.initialLoadDone);
+                    await this.messageNotificationManager?.refresh(!this.initialMailboxLoadDone);
                 }
 
-                this.initialLoadDone = true;
+                this.initialMailboxLoadDone = true;
                 this.lastSort = sortColumn;
                 this.lastSortDescending = this.selectedSortDescending;
-
-                this.isRelayAvailable = !!(await new ServerController().getServer())
-                    .relaySmtpServer;
             } catch (e: any) {
                 this.error = e;
             } finally {
@@ -396,6 +449,9 @@
                 this.connection.on("serverchanged", async () => {
                     await this.refresh(true, true);
                 });
+                this.connection.on("mailboxeschanged", async () => {
+                    await this.refresh(false, true);
+                });
                 this.connection.addOnConnectedCallback(() => {
                     this.refresh(true, true);
                 });
diff --git a/Rnwood.Smtp4dev/ClientApp/src/components/sessionlist.vue b/Rnwood.Smtp4dev/ClientApp/src/components/sessionlist.vue
index a56b033eb..5ccb1d7a6 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/components/sessionlist.vue
+++ b/Rnwood.Smtp4dev/ClientApp/src/components/sessionlist.vue
@@ -1,16 +1,18 @@
 <template>
     <div class="sessionlist">
         <div class="toolbar">
-            <el-button icon="close" title="Clear" @click="clear"></el-button>
-
             <el-button icon="Delete"
                        v-on:click="deleteSelected"
                        :disabled="!selectedsession"
-                       title="Delete"></el-button>
-            <el-button icon="refresh"
-                       v-on:click="refresh"
-                       :disabled="loading"
-                       title="Refresh"></el-button>
+                       title="Delete">Delete</el-button>
+            <el-button-group>
+                <el-button icon="refresh"
+                           v-on:click="refresh"
+                           :disabled="loading"
+                           title="Refresh"></el-button>
+                <el-button icon="close" title="Clear" @click="clear"></el-button>
+            </el-button-group>
+
         </div>
 
         <el-alert v-if="error" type="error" title="Error" show-icon>
diff --git a/Rnwood.Smtp4dev/ClientApp/src/components/settingsdialog.vue b/Rnwood.Smtp4dev/ClientApp/src/components/settingsdialog.vue
index 92a15fd90..f1b62f499 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/components/settingsdialog.vue
+++ b/Rnwood.Smtp4dev/ClientApp/src/components/settingsdialog.vue
@@ -5,7 +5,7 @@
                 {{error.message}}
             </el-alert>
 
-            <el-form v-if="server" :model="this" ref="form" :rules="rules" :disabled="saving">
+            <el-form v-if="server" :model="this" ref="form" :rules="rules" :disabled="saving" scroll-to-error>
                 <el-tabs tab-position="top">
                     <el-tab-pane label="General">
                         <el-form-item label="Hostname (SMTP, IMAP)" prop="server.hostName">
@@ -263,14 +263,14 @@
 
 
                         <el-form-item>
-                            SMTP and IMAP Users:       <el-icon v-if="server.lockedSettings.users" :title="`Locked: ${server.lockedSettings.users}`"><Lock /></el-icon>
+                            Web/API, SMTP, IMAP Users:       <el-icon v-if="server.lockedSettings.users" :title="`Locked: ${server.lockedSettings.users}`"><Lock /></el-icon>
 
                         </el-form-item>
 
 
 
                         <div v-for="(user, index) in server.users" :key="index">
-                            <el-form-item class="flex md-5 gap-4" :prop="'server.users[' + index + ']'" :rules="{validator: checkUsernameUnique}">
+                            <el-form-item :prop="'server.users[' + index + ']'" :rules="{validator: checkUsernameUnique}">
                                 <el-form-item label="Username" :prop="'server.users[' + index + '].username'" :rules="{required: true, message: 'Required'}">
                                     <el-input v-model="user.username" :disabled="server.lockedSettings.users">
                                     </el-input>
@@ -280,14 +280,62 @@
 
                                     </el-input>
                                 </el-form-item>
-                                <el-button @click="server.users.splice(index, 1)" :disabled="server.lockedSettings.users">
-                                    Remove
+                                <el-form-item label="Default Mailbox" :prop="'server.users[' + index + '].defaultMailbox'" :rules="{required: true, message: 'Required'}">
+                                    <el-select v-model="user.defaultMailbox" style="width: 150px;" :disabled="server.lockedSettings.defaultMailbox">
+                                        <el-option v-for="item in [{name:'Default'}].concat(server.mailboxes)"
+                                                   :key="item.name"
+                                                   :label="item.name"
+                                                   :value="item.name" />
+
+                                        <template #prefix>
+                                            <el-icon><MessageBox /></el-icon>
+                                        </template>
+                                    </el-select>
+                                </el-form-item>
+                                <el-button title="Remove" @click="server.users.splice(index, 1)" :disabled="server.lockedSettings.users">
+                                    <el-icon><Close /></el-icon>
                                 </el-button>
                             </el-form-item>
                         </div>
                         <el-button size="small" @click="server.users.push({})" :disabled="server.lockedSettings.users">New User</el-button>
 
 
+                    </el-tab-pane>
+                    <el-tab-pane label="Mailboxes">
+
+
+                        <el-form-item>
+                            Mailboxes:       <el-icon v-if="server.lockedSettings.mailboxes" :title="`Locked: ${server.lockedSettings.mailboxes}`"><Lock /></el-icon>
+
+                        </el-form-item>
+
+
+
+                        <div v-for="(mailbox, index) in server.mailboxes" :key="index">
+                            <el-form-item :prop="'server.mailboxes[' + index + ']'" :rules="{validator: checkMailboxNameUnique}">
+                                <el-button @click="server.mailboxes.splice(index, 1); server.mailboxes.splice(index-1, 0, mailbox);" :disabled="server.lockedSettings.mailboxes || index==0">
+                                    <el-icon><ArrowUp /></el-icon>
+                                </el-button>
+                                <el-button @click="server.mailboxes.splice(index, 1); server.mailboxes.splice(index+1, 0, mailbox) " :disabled="server.lockedSettings.mailboxes || index==server.mailboxes.length-1">
+                                    <el-icon><ArrowDown /></el-icon>
+                                </el-button>
+                                <el-form-item label="Name" :prop="'server.mailboxes[' + index + '].name'" :rules="{required: true, message: 'Required'}">
+                                    <el-input v-model="mailbox.name" :disabled="server.lockedSettings.mailboxes">
+                                    </el-input>
+                                </el-form-item>
+                                <el-form-item label="Recipients" :prop="'server.mailboxes[' + index + '].recipients'" :rules="{required: true, message: 'Required'}">
+                                    <el-input v-model="mailbox.recipients" :disabled="server.lockedSettings.mailboxes">
+
+                                    </el-input>
+                                </el-form-item>
+                                <el-button title="Remove" @click="server.mailboxes.splice(index, 1)" :disabled="server.lockedSettings.mailboxes">
+                                    <el-icon><Close /></el-icon>
+                                </el-button>
+                            </el-form-item>
+                        </div>
+                        <el-button size="small" @click="server.mailboxes.splice(0, 0, {})" :disabled="server.lockedSettings.mailboxes">New Mailbox</el-button>
+
+
                     </el-tab-pane>
                     <el-tab-pane label="Desktop" v-if="server.isDesktopApp">
 
@@ -356,6 +404,18 @@
 
         }
 
+        checkMailboxNameUnique(rule: any, value: any, callback: any) {
+            if (value.name === "Default") {
+                callback(new Error("Name cannot be 'Default'"));
+            }
+            else if (value && this.server?.mailboxes.filter(u => u != value).find(u => u.name == value.name)) {
+                callback(new Error('Name must be unique'));
+            } else {
+                callback();
+            }
+
+        }
+
         checkUsernameUnique(rule: any, value: any, callback: any) {
             if (value && this.server?.users.filter(u => u != value).find(u => u.username == value.username)) {
                 callback(new Error('Username must be unique'));
diff --git a/Rnwood.Smtp4dev/ClientApp/src/css/site.css b/Rnwood.Smtp4dev/ClientApp/src/css/site.css
index 0b86b2c7d..8a198e3a4 100644
--- a/Rnwood.Smtp4dev/ClientApp/src/css/site.css
+++ b/Rnwood.Smtp4dev/ClientApp/src/css/site.css
@@ -163,4 +163,19 @@ pre.source code {
 
 .splitpanes.default-theme .splitpanes__pane {
     background-color: transparent !important;
+}
+
+.toolbar {
+    display: flex;
+    flex-wrap: wrap;
+    column-gap: 6px;
+    row-gap: 6px;
+    align-items: start;
+    padding-right: 12px;
+    padding-bottom: 12px
+}
+
+.el-form-item__content {
+    column-gap: 6px;
+    row-gap: 6px;
 }
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/CommandLineParser.cs b/Rnwood.Smtp4dev/CommandLineParser.cs
index 9bd3a7232..ff8844359 100644
--- a/Rnwood.Smtp4dev/CommandLineParser.cs
+++ b/Rnwood.Smtp4dev/CommandLineParser.cs
@@ -26,7 +26,7 @@ public static MapOptions<CommandLineOptions> TryParseCommandLine(IEnumerable<str
                 { "disableipv6", "If true, SMTP and IMAP servers will NOT listen using IPv6 Dual Stack", data => map.Add((data !=null).ToString(), x => x.ServerOptions.DisableIPv6)},
                 { "smtpport=", "Set the port the SMTP server listens on. Specify 0 to assign automatically", data => map.Add(data, x => x.ServerOptions.Port) },
                 { "db=", "Specifies the path where the database will be stored relative to APPDATA env var on Windows or XDG_CONFIG_HOME on non-Windows. Specify \"\" to use an in memory database.", data => map.Add(data, x => x.ServerOptions.Database) },
-                { "messagestokeep=", "Specifies the number of messages to keep", data => map.Add(data, x => x.ServerOptions.NumberOfMessagesToKeep) },
+                { "messagestokeep=", "Specifies the number of messages to keep per mailbox", data => map.Add(data, x => x.ServerOptions.NumberOfMessagesToKeep) },
                 { "sessionstokeep=", "Specifies the number of sessions to keep", data => map.Add(data, x => x.ServerOptions.NumberOfSessionsToKeep) },
                 { "tlsmode=", "Specifies the TLS mode to use for SMTP. None=Off. StartTls=On demand if client supports STARTTLS. ImplicitTls=TLS as soon as connection is established.", data => map.Add(data, x => x.ServerOptions.TlsMode) },
                 { "tlscertificate=", "Specifies the TLS certificate to use for SMTP if TLS is enabled/requested. Specify \"\" to use an auto-generated self-signed certificate (then see console output on first startup)", data => map.Add(data, x => x.ServerOptions.TlsCertificate) },
@@ -55,8 +55,10 @@ public static MapOptions<CommandLineOptions> TryParseCommandLine(IEnumerable<str
                 { "SmtpAuthTypesNotSecure=", "SMTP auth type enabled when not using secure connection (choices: ANONYMOUS, PLAIN, LOGIN, CRAM-MD5). Separate values with comma.", data =>
                        map.Add(data, x => x.ServerOptions.SmtpEnabledAuthTypesWhenNotSecureConnection) },
                 { "SmtpAuthTypesSecure=", "SMTP auth type enabled when  using secure connection (choices: ANONYMOUS, PLAIN, LOGIN, CRAM-MD5). Separate values with comma.", data =>
-                       map.Add(data, x => x.ServerOptions.SmtpEnabledAuthTypesWhenSecureConnection) }
-                
+                       map.Add(data, x => x.ServerOptions.SmtpEnabledAuthTypesWhenSecureConnection) },
+                { "mailbox=", "Adds a mailbox in Name=Recipients format (Recipients can contain comma separated wildcards or regex)see appsettings for more details). This option can be repeated to add multiple users.", data =>
+                       map.Add(data, x => x.ServerOptions.Users)},
+
 
             };
 
diff --git a/Rnwood.Smtp4dev/Controllers/MailboxesController.cs b/Rnwood.Smtp4dev/Controllers/MailboxesController.cs
new file mode 100644
index 000000000..e45493234
--- /dev/null
+++ b/Rnwood.Smtp4dev/Controllers/MailboxesController.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Rnwood.Smtp4dev.Data;
+using Rnwood.Smtp4dev.DbModel;
+using Rnwood.Smtp4dev.Server.Settings;
+
+namespace Rnwood.Smtp4dev.Controllers
+{
+    /// <summary>
+    /// Returns information about the version of smtp4dev
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    [UseEtagFilter]
+    public class MailboxesController : Controller
+    {
+        private Smtp4devDbContext dbContext;
+
+        public MailboxesController(Smtp4devDbContext dbContext)
+        {
+            this.dbContext = dbContext;
+        }
+
+        /// <summary>
+        /// Gets list of mailboxes.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult<IList<Mailbox>> GetAll()
+        {
+            return this.dbContext.Mailboxes.ToList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/Controllers/MessagesController.cs b/Rnwood.Smtp4dev/Controllers/MessagesController.cs
index 0c740e4f1..24d24745f 100644
--- a/Rnwood.Smtp4dev/Controllers/MessagesController.cs
+++ b/Rnwood.Smtp4dev/Controllers/MessagesController.cs
@@ -14,6 +14,7 @@
 using Rnwood.Smtp4dev.Data;
 using Rnwood.Smtp4dev.DbModel;
 using NSwag.Annotations;
+using Rnwood.Smtp4dev.Server.Settings;
 
 namespace Rnwood.Smtp4dev.Controllers
 {
@@ -36,13 +37,14 @@ public MessagesController(IMessagesRepository messagesRepository, ISmtp4devServe
         /// Returns all new messages since the provided message ID. Returns only the summary without message content.
         /// </summary>
         /// <param name="lastSeenMessageId">If not specified all recently received messages will be returned up to the page limit.</param>
+        /// <param name="mailboxName">Mailbox name. If not specified, defaults to the mailboxName with name 'Default'</param>
         /// <param name="pageSize">Max number of messages to retrieve. The most recent X are returned.</param>
         /// <returns></returns>
         [HttpGet("new")]
         [SwaggerResponse(System.Net.HttpStatusCode.OK, typeof(MessageSummary[]), Description = "")]
-        public MessageSummary[] GetNewSummaries(Guid? lastSeenMessageId, int pageSize = 50)
+        public MessageSummary[] GetNewSummaries(Guid? lastSeenMessageId, string mailboxName = MailboxOptions.DEFAULTNAME, int pageSize = 50)
         {
-            return messagesRepository.GetMessages(true)
+            return messagesRepository.GetMessages(mailboxName, true)
                 .OrderByDescending(m => m.ReceivedDate)
                 .ThenByDescending(m => m.Id)
                 .AsEnumerable()
@@ -56,6 +58,7 @@ public MessageSummary[] GetNewSummaries(Guid? lastSeenMessageId, int pageSize =
         /// Returns a list of message summaries including basic details but not the content.
         /// </summary>
         /// <param name="searchTerms">Case insensitive term to search for in subject,from,to</param>
+        /// <param name="mailboxName">Mailbox name. If not specified, defaults to the mailboxName with name 'Default'</param>
         /// <param name="sortColumn">Property name from response type to sort by</param>
         /// <param name="sortIsDescending">True if sort should be descending</param>
         /// <param name="page">Page number to retrieve</param>
@@ -63,11 +66,11 @@ public MessageSummary[] GetNewSummaries(Guid? lastSeenMessageId, int pageSize =
         /// <returns></returns>
         [HttpGet]
         [SwaggerResponse(System.Net.HttpStatusCode.OK, typeof(ApiModel.PagedResult<MessageSummary>), Description = "")]
-        public ApiModel.PagedResult<MessageSummary> GetSummaries(string searchTerms, string sortColumn = "receivedDate",
+        public ApiModel.PagedResult<MessageSummary> GetSummaries(string searchTerms, string mailboxName = MailboxOptions.DEFAULTNAME, string sortColumn = "receivedDate",
             bool sortIsDescending = true, int page = 1,
             int pageSize = 5)
         {
-            IEnumerable<DbModel.Message> query = messagesRepository.GetMessages(true)
+            IEnumerable<DbModel.Message> query = messagesRepository.GetMessages(mailboxName, true)
                 .Include(m => m.Relays)
                 .OrderBy(sortColumn + (sortIsDescending ? " DESC" : ""));
 
@@ -122,9 +125,9 @@ public Task MarkMessageRead(Guid id)
         /// <returns></returns>
         [HttpPost("markAllRead")]
         [SwaggerResponse(System.Net.HttpStatusCode.OK, typeof(void), Description = "")]
-        public Task MarkAllRead()
+        public Task MarkAllRead(string mailboxName=MailboxOptions.DEFAULTNAME)
         {
-            return messagesRepository.MarkAllMessagesRead();
+            return messagesRepository.MarkAllMessagesRead(mailboxName);
         }
 
         /// <summary>
@@ -344,9 +347,9 @@ public async Task Delete(Guid id)
         /// <returns></returns>
         [HttpDelete("*")]
         [SwaggerResponse(System.Net.HttpStatusCode.OK, typeof(void), Description = "")]
-        public async Task DeleteAll()
+        public async Task DeleteAll(string mailboxName=MailboxOptions.DEFAULTNAME)
         {
-            await messagesRepository.DeleteAllMessages();
+            await messagesRepository.DeleteAllMessages(mailboxName);
         }
     }
 }
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/Controllers/ServerController.cs b/Rnwood.Smtp4dev/Controllers/ServerController.cs
index 7b79a4f29..ec92e31b3 100644
--- a/Rnwood.Smtp4dev/Controllers/ServerController.cs
+++ b/Rnwood.Smtp4dev/Controllers/ServerController.cs
@@ -50,6 +50,18 @@ public ServerController(ISmtp4devServer server, ImapServer imapServer, IOptionsM
         [HttpGet]
         public ApiModel.Server GetServer()
         {
+            string currentUserName = this.User?.Identity?.Name;
+            string currentUserDefaultMailbox = MailboxOptions.DEFAULTNAME;
+
+            if (!string.IsNullOrEmpty(currentUserName))
+            {
+               var user = serverOptions.CurrentValue.Users.FirstOrDefault(u => currentUserName.Equals(u.Username, StringComparison.CurrentCultureIgnoreCase));
+                if (user != null)
+                {
+                    currentUserDefaultMailbox = user.DefaultMailbox ?? MailboxOptions.DEFAULTNAME;
+                }
+            }
+
             var lockedSettings = GetLockedSettings(true);
 
             var serverOptionsCurrentValue = serverOptions.CurrentValue;
@@ -85,10 +97,13 @@ public ApiModel.Server GetServer()
                 DisableIPv6 = serverOptionsCurrentValue.DisableIPv6,
                 WebAuthenticationRequired = serverOptionsCurrentValue.WebAuthenticationRequired,
                 Users = serverOptionsCurrentValue.Users,
+				Mailboxes = serverOptionsCurrentValue.Mailboxes,
                 DesktopMinimiseToTrayIcon = desktopOptions.CurrentValue.MinimiseToTrayIcon,
                 IsDesktopApp = cmdLineOptions.IsDesktopApp,
 				SmtpEnabledAuthTypesWhenNotSecureConnection = serverOptionsCurrentValue.SmtpEnabledAuthTypesWhenNotSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
-				SmtpEnabledAuthTypesWhenSecureConnection = serverOptionsCurrentValue.SmtpEnabledAuthTypesWhenSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+				SmtpEnabledAuthTypesWhenSecureConnection = serverOptionsCurrentValue.SmtpEnabledAuthTypesWhenSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
+                CurrentUserName = currentUserName,
+                CurrentUserDefaultMailboxName = currentUserDefaultMailbox
 			};
         }
 
@@ -208,6 +223,7 @@ public ActionResult UpdateServer(ApiModel.Server serverUpdate)
             newSettings.MessageValidationExpression = serverUpdate.MessageValidationExpression;
             newSettings.DisableIPv6 = serverUpdate.DisableIPv6;
             newSettings.Users = serverUpdate.Users;
+			newSettings.Mailboxes = serverUpdate.Mailboxes;
             newSettings.WebAuthenticationRequired = serverUpdate.WebAuthenticationRequired;
             newSettings.SmtpAllowAnyCredentials = serverUpdate.SmtpAllowAnyCredentials;
 			newSettings.SmtpEnabledAuthTypesWhenNotSecureConnection = string.Join(",", serverUpdate.SmtpEnabledAuthTypesWhenNotSecureConnection);
diff --git a/Rnwood.Smtp4dev/Data/IMessagesRepository.cs b/Rnwood.Smtp4dev/Data/IMessagesRepository.cs
index f1e35a049..ad8f138bc 100644
--- a/Rnwood.Smtp4dev/Data/IMessagesRepository.cs
+++ b/Rnwood.Smtp4dev/Data/IMessagesRepository.cs
@@ -6,14 +6,16 @@ namespace Rnwood.Smtp4dev.Data
 {
     public interface IMessagesRepository
     {
-        Task MarkAllMessagesRead();
+        Task MarkAllMessagesRead(string mailbox);
         Task MarkMessageRead(Guid id);
 
-        IQueryable<DbModel.Message> GetMessages(bool unTracked = true);
+        IQueryable<DbModel.Message> GetAllMessages(bool unTracked = true);
+
+        IQueryable<DbModel.Message> GetMessages(string mailboxName, bool unTracked = true);
 
         Task DeleteMessage(Guid id);
 
-        Task DeleteAllMessages();
+        Task DeleteAllMessages(string mailbox);
 
         Task<DbModel.Message> TryGetMessageById(Guid id, bool tracked);
 
diff --git a/Rnwood.Smtp4dev/Data/MessagesRepository.cs b/Rnwood.Smtp4dev/Data/MessagesRepository.cs
index 6d9722b80..246c5c430 100644
--- a/Rnwood.Smtp4dev/Data/MessagesRepository.cs
+++ b/Rnwood.Smtp4dev/Data/MessagesRepository.cs
@@ -23,19 +23,19 @@ public MessagesRepository(ITaskQueue taskQueue, NotificationsHub notificationsHu
 
         public Smtp4devDbContext DbContext => this.dbContext;
 
-        public Task MarkAllMessagesRead()
+        public Task MarkAllMessagesRead(string mailbox)
         {
             return taskQueue.QueueTask(() =>
             {
                 // More performant to bulk update but will need to test platform compat of SQLitePCLRaw.bundle_e_sqlite3 /~https://github.com/borisdj/EFCore.BulkExtensions
-                var unReadMessages = dbContext.Messages.Where(m => m.IsUnread);
+                var unReadMessages = dbContext.Messages.Where(m => m.Mailbox.Name == mailbox && m.IsUnread);
                 foreach (var msg in unReadMessages)
                 {
                     msg.IsUnread = false;
                 }
 
                 dbContext.SaveChanges();
-                notificationsHub.OnMessagesChanged().Wait();
+                notificationsHub.OnMessagesChanged(mailbox).Wait();
             }, true);
         }
 
@@ -43,42 +43,54 @@ public Task MarkMessageRead(Guid id)
         {
             return taskQueue.QueueTask(() =>
             {
-                var message = dbContext.Messages.FindAsync(id).Result;
+                var message = dbContext.Messages.Include(m => m.Mailbox).FirstOrDefault(m => m.Id == id);
                 if (message?.IsUnread != true) return;
                 message.IsUnread = false;
                 dbContext.SaveChanges();
-                notificationsHub.OnMessagesChanged().Wait();
+                notificationsHub.OnMessagesChanged(message.Mailbox.Name).Wait();
             }, true);
         }
 
-        public IQueryable<Message> GetMessages(bool unTracked = true)
+        public IQueryable<Message> GetAllMessages(bool unTracked = true)
         {
-            return unTracked ? dbContext.Messages.AsNoTracking() : dbContext.Messages;
+            var query = dbContext.Messages;
+            return unTracked ? query.AsNoTracking() : query;
+        }
+
+        public IQueryable<Message> GetMessages(string mailboxName, bool unTracked = true)
+        {
+            var query = dbContext.Messages.Where(m => m.Mailbox.Name == mailboxName);
+            return unTracked ? query.AsNoTracking() : query;
         }
 
         public Task DeleteMessage(Guid id)
         {
             return taskQueue.QueueTask(() =>
             {
-                dbContext.Messages.RemoveRange(dbContext.Messages.Where(m => m.Id == id));
-                dbContext.SaveChanges();
-                notificationsHub.OnMessagesChanged().Wait();
+                var message = dbContext.Messages.Include(m => m.Mailbox).FirstOrDefault(m => m.Id == id);
+
+                if (message != null)
+                {
+                    dbContext.Messages.Remove(message);
+                    dbContext.SaveChanges();
+                    notificationsHub.OnMessagesChanged(message.Mailbox.Name).Wait();
+                }
             }, true);
         }
 
-        public Task DeleteAllMessages()
+        public Task DeleteAllMessages(string mailbox)
         {
             return taskQueue.QueueTask(() =>
             {
-                dbContext.Messages.RemoveRange(dbContext.Messages);
+                dbContext.Messages.RemoveRange(dbContext.Messages.Where(m=> m.Mailbox.Name == mailbox));
                 dbContext.SaveChanges();
-                notificationsHub.OnMessagesChanged().Wait();
+                notificationsHub.OnMessagesChanged(mailbox).Wait();
             }, true);
         }
 
         public Task<Message> TryGetMessageById(Guid id, bool tracked)
         {
-            return this.GetMessages(!tracked).SingleOrDefaultAsync(m => m.Id == id);
+            return this.GetAllMessages(!tracked).SingleOrDefaultAsync(m => m.Id == id);
         }
         
     }
diff --git a/Rnwood.Smtp4dev/Data/Smtp4devDbContext.cs b/Rnwood.Smtp4dev/Data/Smtp4devDbContext.cs
index 4284b877a..cf63f1ea3 100644
--- a/Rnwood.Smtp4dev/Data/Smtp4devDbContext.cs
+++ b/Rnwood.Smtp4dev/Data/Smtp4devDbContext.cs
@@ -32,5 +32,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         public DbSet<Session> Sessions { get; set; }
 
         public DbSet<ImapState> ImapState { get; set; }
+
+        public DbSet<Mailbox> Mailboxes { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Rnwood.Smtp4dev/DbModel/Mailbox.cs b/Rnwood.Smtp4dev/DbModel/Mailbox.cs
new file mode 100644
index 000000000..957bac2cd
--- /dev/null
+++ b/Rnwood.Smtp4dev/DbModel/Mailbox.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Rnwood.SmtpServer;
+
+namespace Rnwood.Smtp4dev.DbModel
+{
+    public class Mailbox
+    {
+        public Mailbox()
+        {
+
+        }
+
+        [Key]
+        public Guid Id { get; set; }
+
+        public string Name { get; set; }
+    }
+}
diff --git a/Rnwood.Smtp4dev/DbModel/Message.cs b/Rnwood.Smtp4dev/DbModel/Message.cs
index 1e6f80c98..0c6aea82b 100644
--- a/Rnwood.Smtp4dev/DbModel/Message.cs
+++ b/Rnwood.Smtp4dev/DbModel/Message.cs
@@ -23,6 +23,8 @@ public class Message
         public string SessionEncoding { get; set; }
 
         public Session Session { get; set; }
+
+        public Mailbox Mailbox { get; set; }
         public int AttachmentCount { get; set; }
 
         public bool IsUnread { get; set; }
diff --git a/Rnwood.Smtp4dev/Hubs/NotificationsHub.cs b/Rnwood.Smtp4dev/Hubs/NotificationsHub.cs
index 418425524..a95d8318a 100644
--- a/Rnwood.Smtp4dev/Hubs/NotificationsHub.cs
+++ b/Rnwood.Smtp4dev/Hubs/NotificationsHub.cs
@@ -26,11 +26,11 @@ public override Task OnConnectedAsync()
 
         
 
-        public async Task OnMessagesChanged()
+        public async Task OnMessagesChanged(string mailbox)
         {
             if (Clients != null)
             {
-                await Clients.All.SendAsync("messageschanged");
+                await Clients.All.SendAsync("messageschanged", mailbox);
             }
         }
 
@@ -49,5 +49,13 @@ public async Task OnSessionsChanged()
                 await Clients.All.SendAsync("sessionschanged");
             }
         }
+
+        public async Task OnMailboxesChanged()
+        {
+            if (Clients != null)
+            {
+                await Clients.All.SendAsync("mailboxeschanged");
+            }
+        }
     }
 }
diff --git a/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.Designer.cs b/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.Designer.cs
new file mode 100644
index 000000000..4b5e9654f
--- /dev/null
+++ b/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.Designer.cs
@@ -0,0 +1,202 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Rnwood.Smtp4dev.Data;
+
+#nullable disable
+
+namespace Rnwood.Smtp4dev.Migrations
+{
+    [DbContext(typeof(Smtp4devDbContext))]
+    [Migration("20240425190525_AddMailboxes")]
+    partial class AddMailboxes
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.4");
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.ImapState", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("LastUid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ImapState");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Mailbox", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Mailboxes");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Message", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AttachmentCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte[]>("Data")
+                        .HasColumnType("BLOB");
+
+                    b.Property<bool?>("EightBitTransport")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("From")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("ImapUid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsUnread")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("MailboxId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeParseError")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ReceivedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelayError")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SecureConnection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SessionEncoding")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SessionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Subject")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("To")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailboxId");
+
+                    b.HasIndex("SessionId");
+
+                    b.ToTable("Messages");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.MessageRelay", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("MessageId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("SendDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("To")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId");
+
+                    b.ToTable("MessageRelays");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Session", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClientAddress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClientName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Log")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("NumberOfMessages")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SessionError")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SessionErrorType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sessions");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Message", b =>
+                {
+                    b.HasOne("Rnwood.Smtp4dev.DbModel.Mailbox", "Mailbox")
+                        .WithMany()
+                        .HasForeignKey("MailboxId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Rnwood.Smtp4dev.DbModel.Session", "Session")
+                        .WithMany()
+                        .HasForeignKey("SessionId");
+
+                    b.Navigation("Mailbox");
+
+                    b.Navigation("Session");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.MessageRelay", b =>
+                {
+                    b.HasOne("Rnwood.Smtp4dev.DbModel.Message", "Message")
+                        .WithMany("Relays")
+                        .HasForeignKey("MessageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Message");
+                });
+
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Message", b =>
+                {
+                    b.Navigation("Relays");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.cs b/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.cs
new file mode 100644
index 000000000..2e99d6bba
--- /dev/null
+++ b/Rnwood.Smtp4dev/Migrations/20240425190525_AddMailboxes.cs
@@ -0,0 +1,65 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Rnwood.Smtp4dev.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddMailboxes : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "MailboxId",
+                table: "Messages",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Mailboxes",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Mailbox", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Messages_MailboxId",
+                table: "Messages",
+                column: "MailboxId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Messages_Mailboxes_MailboxId",
+                table: "Messages",
+                column: "MailboxId",
+                principalTable: "Mailboxes",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Messages_Mailboxes_MailboxId",
+                table: "Messages");
+
+            migrationBuilder.DropTable(
+                name: "Mailboxes");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Messages_MailboxId",
+                table: "Messages");
+
+            migrationBuilder.DropColumn(
+                name: "MailboxId",
+                table: "Messages");
+        }
+    }
+}
diff --git a/Rnwood.Smtp4dev/Migrations/Smtp4devDbContextModelSnapshot.cs b/Rnwood.Smtp4dev/Migrations/Smtp4devDbContextModelSnapshot.cs
index 0b1ed9c4f..39f7aa97f 100644
--- a/Rnwood.Smtp4dev/Migrations/Smtp4devDbContextModelSnapshot.cs
+++ b/Rnwood.Smtp4dev/Migrations/Smtp4devDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class Smtp4devDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.2");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.4");
 
             modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.ImapState", b =>
                 {
@@ -31,6 +31,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("ImapState");
                 });
 
+            modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Mailbox", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Mailboxes");
+                });
+
             modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Message", b =>
                 {
                     b.Property<Guid>("Id")
@@ -55,6 +69,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("IsUnread")
                         .HasColumnType("INTEGER");
 
+                    b.Property<Guid?>("MailboxId")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("MimeParseError")
                         .HasColumnType("TEXT");
 
@@ -81,6 +98,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
+                    b.HasIndex("MailboxId");
+
                     b.HasIndex("SessionId");
 
                     b.ToTable("Messages");
@@ -145,10 +164,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Rnwood.Smtp4dev.DbModel.Message", b =>
                 {
+                    b.HasOne("Rnwood.Smtp4dev.DbModel.Mailbox", "Mailbox")
+                        .WithMany()
+                        .HasForeignKey("MailboxId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
                     b.HasOne("Rnwood.Smtp4dev.DbModel.Session", "Session")
                         .WithMany()
                         .HasForeignKey("SessionId");
 
+                    b.Navigation("Mailbox");
+
                     b.Navigation("Session");
                 });
 
diff --git a/Rnwood.Smtp4dev/Program.cs b/Rnwood.Smtp4dev/Program.cs
index 19d6f6f61..e453850a1 100644
--- a/Rnwood.Smtp4dev/Program.cs
+++ b/Rnwood.Smtp4dev/Program.cs
@@ -22,6 +22,7 @@
 using Microsoft.Extensions.Hosting;
 using Mono.Options;
 using Rnwood.Smtp4dev.Controllers;
+using Rnwood.Smtp4dev.DbModel;
 using Rnwood.Smtp4dev.Server;
 using Rnwood.Smtp4dev.Server.Settings;
 using Rnwood.Smtp4dev.Service;
@@ -103,6 +104,7 @@ public static async Task<IHost> StartApp(IEnumerable<string> args, bool isDeskto
             var host = BuildWebHost(args.Where(arg => arg != "--service").ToArray(), cmdLineOptions, commandLineOptions);
 
 
+
             await host.StartAsync();
 
 
@@ -119,6 +121,7 @@ public static async Task<IHost> StartApp(IEnumerable<string> args, bool isDeskto
 
         }
 
+
         private static string GetContentRoot()
         {
             string installLocation = AppContext.BaseDirectory;
diff --git a/Rnwood.Smtp4dev/Properties/launchSettings.json b/Rnwood.Smtp4dev/Properties/launchSettings.json
index 106531df4..ce0632519 100644
--- a/Rnwood.Smtp4dev/Properties/launchSettings.json
+++ b/Rnwood.Smtp4dev/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Rnwood.Smtp4dev": {
       "commandName": "Project",
-      "commandLineArgs": "",
+      "commandLineArgs": "--db=",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj b/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj
index 9ab30ae0b..b2e2f79ff 100644
--- a/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj
+++ b/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj
@@ -30,6 +30,7 @@
     <PackageReference Include="AspNetCore.Authentication.Basic" Version="8.0.0" />
     <PackageReference Include="CommandLiners.MonoOptions" Version="1.0.45" />
     <PackageReference Include="DeepEqual" Version="5.0.0" />
+    <PackageReference Include="DotNet.Glob" Version="3.1.3" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.60" />
     <PackageReference Include="Jint" Version="3.0.1" />
     <PackageReference Include="MailKit" Version="4.5.0" />
@@ -170,6 +171,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ClientApp Remove="ClientApp\src\ApiClient\Mailbox.ts" />
+    <ClientApp Remove="ClientApp\src\ApiClient\MailboxesController.ts" />
     <ClientApp Remove="ClientApp\src\ApiClient\MessageRelayOptions.cs" />
     <ClientApp Remove="ClientApp\src\ApiClient\MessageRelayOptions.ts" />
     <ClientApp Remove="ClientApp\src\ApiClient\Server.ts" />
diff --git a/Rnwood.Smtp4dev/Server/ImapServer.cs b/Rnwood.Smtp4dev/Server/ImapServer.cs
index bac6f4383..6af21ea94 100644
--- a/Rnwood.Smtp4dev/Server/ImapServer.cs
+++ b/Rnwood.Smtp4dev/Server/ImapServer.cs
@@ -41,7 +41,7 @@ public ImapServer(IOptionsMonitor<ServerOptions> serverOptions, ScriptingHost sc
 
         private void OnServerOptionsChanged(ServerOptions serverOptions)
         {
-            if (serverOptions.IsDeepEqual( this.lastStartOptions))
+            if (serverOptions.IsDeepEqual(this.lastStartOptions))
             {
                 return;
             }
@@ -158,7 +158,7 @@ public async void TryStart()
                     await Task.Delay(100);
                 }
 
-                foreach(var lp in imapServer.ListeningPoints)
+                foreach (var lp in imapServer.ListeningPoints)
                 {
                     var ep = ((IPEndPoint)lp.Socket.LocalEndPoint);
                     int port = ep.Port;
@@ -190,7 +190,7 @@ Task IHostedService.StartAsync(CancellationToken cancellationToken)
         {
             this.TryStart();
             return Task.CompletedTask;
- 
+
         }
 
         Task IHostedService.StopAsync(CancellationToken cancellationToken)
@@ -266,7 +266,9 @@ private void Session_GetMessagesInfo(object sender, IMAP_e_MessagesInfo e)
 
                     if (e.Folder == "INBOX")
                     {
-                        foreach (var message in messagesRepository.GetMessages())
+
+
+                        foreach (var message in messagesRepository.GetMessages(GetMailboxName()))
                         {
                             List<string> flags = new List<string>();
                             if (!message.IsUnread)
@@ -280,6 +282,13 @@ private void Session_GetMessagesInfo(object sender, IMAP_e_MessagesInfo e)
                 }
             }
 
+            private string GetMailboxName()
+            {
+                var configUser = this.serverOptions.CurrentValue.Users?.FirstOrDefault(u => this.session.AuthenticatedUserIdentity.Name.Equals(u.Username, StringComparison.OrdinalIgnoreCase));
+
+                return configUser?.DefaultMailbox ?? "Default";
+            }
+
             private void Session_Fetch(object sender, IMAP_e_Fetch e)
             {
                 using (var scope = this.serviceScopeFactory.CreateScope())
@@ -288,7 +297,7 @@ private void Session_Fetch(object sender, IMAP_e_Fetch e)
 
                     foreach (var msgInfo in e.MessagesInfo)
                     {
-                        var dbMessage = messagesRepository.GetMessages().SingleOrDefault(m => m.Id == new Guid(msgInfo.ID));
+                        var dbMessage = messagesRepository.GetMessages(GetMailboxName()).SingleOrDefault(m => m.Id == new Guid(msgInfo.ID));
 
                         if (dbMessage != null)
                         {
@@ -310,12 +319,13 @@ private void Session_Login(object sender, IMAP_e_Login e)
                 }
 
                 var user = serverOptions.CurrentValue.Users?.FirstOrDefault(u => e.UserName.Equals(u.Username, StringComparison.CurrentCultureIgnoreCase));
-     
-                if (user != null && e.Password.Equals( user.Password, StringComparison.CurrentCultureIgnoreCase))
+
+                if (user != null && e.Password.Equals(user.Password))
                 {
-                    log.Information("IMAP login success for user {user}", e.UserName);
+                    log.Information("IMAP login success for user {user} to mailbox", e.UserName);
                     e.IsAuthenticated = true;
-                } else
+                }
+                else
                 {
                     log.Error("IMAP login failure for user {user}", e.UserName);
                     e.IsAuthenticated = false;
diff --git a/Rnwood.Smtp4dev/Server/MessageConverter.cs b/Rnwood.Smtp4dev/Server/MessageConverter.cs
index 296e6805a..f806cd7f0 100644
--- a/Rnwood.Smtp4dev/Server/MessageConverter.cs
+++ b/Rnwood.Smtp4dev/Server/MessageConverter.cs
@@ -55,7 +55,7 @@ public class MessageConverter
                     try
                     {
                         CancellationTokenSource cts = new CancellationTokenSource();
-                        cts.CancelAfter(TimeSpan.FromSeconds(10));
+                        cts.CancelAfter(TimeSpan.FromSeconds(30));
                         MimeMessage mime = await MimeMessage.LoadAsync(messageData, true, cts.Token).ConfigureAwait(false);
                         subject = mime.Subject;
 
diff --git a/Rnwood.Smtp4dev/Server/Settings/MailboxOptions.cs b/Rnwood.Smtp4dev/Server/Settings/MailboxOptions.cs
new file mode 100644
index 000000000..3ecb3d9f2
--- /dev/null
+++ b/Rnwood.Smtp4dev/Server/Settings/MailboxOptions.cs
@@ -0,0 +1,39 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Net.Mail;
+
+namespace Rnwood.Smtp4dev.Server.Settings
+{
+    [TypeConverter(typeof(MailboxFromStringConverter))]
+    public record MailboxOptions
+    {
+        public string Name { get; set; }
+        public string Recipients { get; set; }
+
+        internal const string DEFAULTNAME = "Default";
+    }
+
+    public class MailboxFromStringConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return sourceType == typeof(string);
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string stringValue =  value as string;
+
+            string[] values = stringValue.Split('=', 2);
+
+            if (values.Length != 2)
+            {
+                throw new FormatException("Mailbox must be in format \"Name:Recipients\"");
+            }
+
+            return new MailboxOptions { Name = values[0], Recipients = values[1]};
+        }
+    }
+}
diff --git a/Rnwood.Smtp4dev/Server/Settings/ServerOptions.cs b/Rnwood.Smtp4dev/Server/Settings/ServerOptions.cs
index 6382e9520..b80ad07a9 100644
--- a/Rnwood.Smtp4dev/Server/Settings/ServerOptions.cs
+++ b/Rnwood.Smtp4dev/Server/Settings/ServerOptions.cs
@@ -41,11 +41,14 @@ public record ServerOptions
         public string MessageValidationExpression { get; set; }
         public bool DisableIPv6 { get; set; } = false;
 
-        public User[] Users { get; set; } = new User[0];
+        public UserOptions[] Users { get; set; } = [];
+
         public bool WebAuthenticationRequired { get; set; } = false;
 
         public string SmtpEnabledAuthTypesWhenNotSecureConnection { get; set; } = "PLAIN,LOGIN,CRAM-MD5";
 
         public string SmtpEnabledAuthTypesWhenSecureConnection { get; set; } = "PLAIN,LOGIN,CRAM-MD5";
+
+        public MailboxOptions[] Mailboxes { get; set; } = [];
     }
 }
diff --git a/Rnwood.Smtp4dev/Server/Settings/ServerOptionsSource.cs b/Rnwood.Smtp4dev/Server/Settings/ServerOptionsSource.cs
index 4c543e102..9372791cf 100644
--- a/Rnwood.Smtp4dev/Server/Settings/ServerOptionsSource.cs
+++ b/Rnwood.Smtp4dev/Server/Settings/ServerOptionsSource.cs
@@ -44,12 +44,14 @@ public record ServerOptionsSource
         public string MessageValidationExpression { get; set; }
         public bool? DisableIPv6 { get; set; }
 
-        public User[] Users { get; set; }
+        public UserOptions[] Users { get; set; }
         public bool? WebAuthenticationRequired { get; internal set; }
 
-        public string[] SmtpEnabledAuthTypesWhenNotSecureConnection { get; set; } = [];
+        public string[] SmtpEnabledAuthTypesWhenNotSecureConnection { get; set; }
 
-        public string[] SmtpEnabledAuthTypesWhenSecureConnection { get; set; } = [];
+        public string[] SmtpEnabledAuthTypesWhenSecureConnection { get; set; }
+
+        public MailboxOptions[] Mailboxes { get; set; }
 
     }
 }
diff --git a/Rnwood.Smtp4dev/Server/Settings/User.cs b/Rnwood.Smtp4dev/Server/Settings/UserOptions.cs
similarity index 70%
rename from Rnwood.Smtp4dev/Server/Settings/User.cs
rename to Rnwood.Smtp4dev/Server/Settings/UserOptions.cs
index c2b97382e..0bbd70a3b 100644
--- a/Rnwood.Smtp4dev/Server/Settings/User.cs
+++ b/Rnwood.Smtp4dev/Server/Settings/UserOptions.cs
@@ -6,10 +6,12 @@
 namespace Rnwood.Smtp4dev.Server.Settings
 {
     [TypeConverter(typeof(UserFromStringConverter))]
-    public record User
+    public record UserOptions
     {
         public string Username { get; set; }
         public string Password { get; set; }
+
+        public string DefaultMailbox { get; set; } = "Default";
     }
 
     public class UserFromStringConverter : TypeConverter
@@ -25,7 +27,11 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 
             string[] values = stringValue.Split('=', 2);
 
-            return new User { Username = values[0], Password = values.Last() ?? "" };
+            if (values.Length != 2) {
+                throw new FormatException("User must be in format \"Username:Password\"");
+            }
+
+            return new UserOptions { Username = values[0], Password = values[1] };
         }
     }
 }
diff --git a/Rnwood.Smtp4dev/Server/Smtp4devServer.cs b/Rnwood.Smtp4dev/Server/Smtp4devServer.cs
index eb50a6cdd..0d0983dc6 100644
--- a/Rnwood.Smtp4dev/Server/Smtp4devServer.cs
+++ b/Rnwood.Smtp4dev/Server/Smtp4devServer.cs
@@ -28,6 +28,11 @@
 using System.Net;
 using Rnwood.Smtp4dev.Server.Settings;
 using DeepEqual.Syntax;
+using MailboxOptions = Rnwood.Smtp4dev.Server.Settings.MailboxOptions;
+using DotNet.Globbing;
+using System.Text.RegularExpressions;
+using static System.Formats.Asn1.AsnWriter;
+using static MailKit.Net.Imap.ImapMailboxFilter;
 
 namespace Rnwood.Smtp4dev.Server
 {
@@ -48,7 +53,6 @@ public Smtp4devServer(IServiceScopeFactory serviceScopeFactory, IOptionsMonitor<
             this.scriptingHost = scriptingHost;
 
             taskQueue.Start();
-            QueueCleanup();
             StartWatchingServerOptionsForChanges();
         }
 
@@ -61,7 +65,7 @@ private void StartWatchingServerOptionsForChanges()
 
         private void OnServerOptionsChanged(Settings.ServerOptions arg1)
         {
-            if (arg1 .IsDeepEqual( this.lastStartOptions))
+            if (arg1.IsDeepEqual(this.lastStartOptions))
             {
                 return;
             }
@@ -84,7 +88,7 @@ private void CreateSmtpServer()
 
             Settings.ServerOptions serverOptionsValue = serverOptions.CurrentValue;
             this.smtpServer = new Rnwood.SmtpServer.SmtpServer(new SmtpServer.ServerOptions(serverOptionsValue.AllowRemoteConnections, !serverOptionsValue.DisableIPv6, serverOptionsValue.HostName, serverOptionsValue.Port, serverOptionsValue.AuthenticationRequired,
-                serverOptionsValue.SmtpEnabledAuthTypesWhenNotSecureConnection.Split(',', StringSplitOptions.TrimEntries|StringSplitOptions.RemoveEmptyEntries), serverOptionsValue.SmtpEnabledAuthTypesWhenSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
+                serverOptionsValue.SmtpEnabledAuthTypesWhenNotSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries), serverOptionsValue.SmtpEnabledAuthTypesWhenSecureConnection.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries),
                 serverOptionsValue.TlsMode == TlsMode.ImplicitTls ? cert : null,
                 serverOptionsValue.TlsMode == TlsMode.StartTls ? cert : null
             ));
@@ -165,39 +169,67 @@ private async Task OnMessageCompleted(object sender, ConnectionEventArgs e)
         public void Stop()
         {
             log.Information("SMTP server stopping...");
-            this.smtpServer.Stop(true);
+            this.smtpServer?.Stop(true);
         }
 
 
-        private void QueueCleanup()
+        private void DoCleanup()
         {
-            this.taskQueue.QueueTask(
-                () =>
-                {
-                    using var scope = serviceScopeFactory.CreateScope();
-                    Smtp4devDbContext dbContext = scope.ServiceProvider.GetService<Smtp4devDbContext>();
+            //Mark sessions as ended.
+            using var scope = serviceScopeFactory.CreateScope();
+            Smtp4devDbContext dbContext = scope.ServiceProvider.GetService<Smtp4devDbContext>();
+            dbContext.Sessions.Where(s => !s.EndDate.HasValue).ExecuteUpdate(u => u.SetProperty(s => s.EndDate, DateTime.Now));
 
-                    foreach (Session unfinishedSession in dbContext.Sessions.Where(s => !s.EndDate.HasValue).ToArray())
+            //Find mailboxes in config not in DB and create
+            var serverOptionsCurrentValue = this.serverOptions.CurrentValue;
+            var configuredMailboxesAndDefault = serverOptionsCurrentValue.Mailboxes.Concat(new[] { new MailboxOptions { Name = MailboxOptions.DEFAULTNAME } });
+            foreach (MailboxOptions mailbox in configuredMailboxesAndDefault)
+            {
+                var dbMailbox = dbContext.Mailboxes.FirstOrDefault(m => m.Name == mailbox.Name);
+                if (dbMailbox == null)
+                {
+                    log.Information("Creating mailbox {name}", mailbox.Name);
+                    dbMailbox = new Mailbox
                     {
-                        unfinishedSession.EndDate = DateTime.Now;
-                    }
+                        Name = mailbox.Name
+                    };
+                    dbContext.Add(dbMailbox);
+                }
+            }
 
-                    dbContext.SaveChanges();
+            //Find configuredMailboxesAndDefault in DB not in config and delete
+            foreach (var dbMailbox in dbContext.Mailboxes)
+            {
+                if (!configuredMailboxesAndDefault.Any(m => m.Name == dbMailbox.Name))
+                {
+                    log.Information("Deleting mailbox {name}", dbMailbox.Name);
+                    dbContext.Remove(dbMailbox);
+                }
+            }
+            dbContext.SaveChanges();
 
-                    TrimMessages(dbContext);
-                    dbContext.SaveChanges();
+            var defaultMailbox = dbContext.Mailboxes.FirstOrDefault(m => m.Name == MailboxOptions.DEFAULTNAME);
+            foreach (var messageWithoutMailbox in dbContext.Messages.Where(m => m.Mailbox == null))
+            {
+                messageWithoutMailbox.Mailbox = defaultMailbox;
+            }
+            dbContext.SaveChanges();
 
-                    TrimSessions(dbContext);
-                    dbContext.SaveChanges();
+            TrimMessages(dbContext);
+            dbContext.SaveChanges();
+
+            TrimSessions(dbContext);
+            dbContext.SaveChanges();
+
+            this.notificationsHub.OnMessagesChanged("*").Wait();
+            this.notificationsHub.OnSessionsChanged().Wait();
+            this.notificationsHub.OnMailboxesChanged().Wait();
 
-                    this.notificationsHub.OnMessagesChanged().Wait();
-                    this.notificationsHub.OnSessionsChanged().Wait();
-                }, true);
         }
 
         private Task OnAuthenticationCredentialsValidationRequired(object sender, AuthenticationCredentialsValidationEventArgs e)
         {
-            
+
 
             var sessionId = activeSessionsToDbId[e.Session];
             using var scope = serviceScopeFactory.CreateScope();
@@ -333,50 +365,105 @@ public Task DeleteAllSessions()
 
         private async Task OnMessageReceived(object sender, MessageEventArgs e)
         {
-
-            Message message = new MessageConverter().ConvertAsync(e.Message).Result;
             log.Information("Message received. Client address {clientAddress}, From {messageFrom}, To {messageTo}, SecureConnection: {secure}.",
-                e.Message.Session.ClientAddress, e.Message.From, message.To, e.Message.SecureConnection);
-            message.IsUnread = true;
+                e.Message.Session.ClientAddress, e.Message.From, e.Message.Recipients, e.Message.SecureConnection);
+
+            var targetMailboxes = GetTargetMailboxes(e.Message.Recipients);
 
-            void ProcessMessage()
+            if (!targetMailboxes.Any())
             {
-                log.Information("Processing received message");
-                using var scope = serviceScopeFactory.CreateScope();
-                Smtp4devDbContext dbContext = scope.ServiceProvider.GetService<Smtp4devDbContext>();
+                log.Warning("Message with recipients {recipients} will be delivered to 0 configuredMailboxesAndDefault", e.Message.Recipients);
+                return;
+            }
+
+            foreach (var targetMailbox in targetMailboxes)
+            {
+                Message message = new MessageConverter().ConvertAsync(e.Message).Result;
+                message.IsUnread = true;
+
+                await taskQueue.QueueTask(() => ProcessMessage(message, e.Message.Session, targetMailbox), false).ConfigureAwait(false);
+            }
+        }
 
-                message.Session = dbContext.Sessions.Find(activeSessionsToDbId[e.Message.Session]);
-                var relayResult = TryRelayMessage(message, null);
-                message.RelayError = string.Join("\n", relayResult.Exceptions.Select(e => e.Key + ": " + e.Value.Message));
+        private HashSet<MailboxOptions> GetTargetMailboxes(IEnumerable<string> recipients)
+        {
+            HashSet<MailboxOptions> targetMailboxes = new HashSet<MailboxOptions>();
+
+            foreach (var to in recipients)
+            {
+                MailboxOptions targetMailbox = null;
 
-                ImapState imapState = dbContext.ImapState.Single();
-                imapState.LastUid = Math.Max(0, imapState.LastUid + 1);
-                message.ImapUid = imapState.LastUid;
-                if (relayResult.WasRelayed)
+                foreach (var mailbox in this.serverOptions.CurrentValue.Mailboxes.Concat(new[] { new MailboxOptions { Name = MailboxOptions.DEFAULTNAME, Recipients = "*" } }))
                 {
-                    foreach (var relay in relayResult.RelayRecipients)
+                    foreach (var recipRule in mailbox.Recipients?.Split(",", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+                    {
+                        bool isRegex = recipRule.StartsWith("/") && recipRule.EndsWith("/");
+
+                        bool isMatch = isRegex ?
+                            Regex.IsMatch(to, recipRule.Substring(1, recipRule.Length - 2), RegexOptions.IgnoreCase) :
+                            Glob.Parse(recipRule).IsMatch(to);
+
+                        if (isMatch)
+                        {
+                            targetMailbox = mailbox;
+                            break;
+                        }
+                    }
+
+                    if (targetMailbox != null)
                     {
-                        message.AddRelay(new MessageRelay { SendDate = DateTime.UtcNow, To = relay.Email });
+                        break;
                     }
                 }
 
-                dbContext.Messages.Add(message);
+                if (targetMailbox != null)
+                {
+                    targetMailboxes.Add(targetMailbox);
+                }
+                else
+                {
+                    log.Warning("Message recipient {recipient} did not match any mailbox recipients", to);
+                }
+            }
 
-                dbContext.SaveChanges();
+            return targetMailboxes;
+        }
 
-                TrimMessages(dbContext);
-                dbContext.SaveChanges();
-                notificationsHub.OnMessagesChanged().Wait();
-                log.Information("Processing received message DONE");
+        void ProcessMessage(Message message, ISession session, MailboxOptions targetMailbox)
+        {
+            log.Information("Processing received message for mailbox '{mailbox}'", targetMailbox.Name);
+            using var scope = serviceScopeFactory.CreateScope();
+            Smtp4devDbContext dbContext = scope.ServiceProvider.GetService<Smtp4devDbContext>();
+
+            message.Session = dbContext.Sessions.Find(activeSessionsToDbId[session]);
+            message.Mailbox = dbContext.Mailboxes.FirstOrDefault(m => m.Name == targetMailbox.Name);
+            var relayResult = TryRelayMessage(message, null);
+            message.RelayError = string.Join("\n", relayResult.Exceptions.Select(e => e.Key + ": " + e.Value.Message));
+
+            ImapState imapState = dbContext.ImapState.Single();
+            imapState.LastUid = Math.Max(0, imapState.LastUid + 1);
+            message.ImapUid = imapState.LastUid;
+            if (relayResult.WasRelayed)
+            {
+                foreach (var relay in relayResult.RelayRecipients)
+                {
+                    message.AddRelay(new MessageRelay { SendDate = DateTime.UtcNow, To = relay.Email });
+                }
             }
 
-            await taskQueue.QueueTask(ProcessMessage, false).ConfigureAwait(false);
+            dbContext.Messages.Add(message);
+
+            dbContext.SaveChanges();
+
+            TrimMessages(dbContext);
+            dbContext.SaveChanges();
+            notificationsHub.OnMessagesChanged(targetMailbox.Name).Wait();
+            log.Information("Processing received message DONE");
         }
 
         public RelayResult TryRelayMessage(Message message, MailboxAddress[] overrideRecipients)
         {
             var result = new RelayResult(message);
-
             if (!relayOptions.CurrentValue.IsEnabled)
             {
                 return result;
@@ -412,12 +499,12 @@ public RelayResult TryRelayMessage(Message message, MailboxAddress[] overrideRec
                 {
                     log.Information("Relaying message to {recipient}", recipient);
 
-                    using SmtpClient relaySmtpClient = relaySmtpClientFactory(relayOptions.CurrentValue);
+                    using var relaySmtpClient = this.relaySmtpClientFactory(this.relayOptions.CurrentValue);
 
                     if (relaySmtpClient == null)
                     {
                         throw new ApplicationException("Relay server options are incomplete.");
-                    } 
+                    }
                     var apiMsg = new ApiModel.Message(message);
                     MimeMessage newEmail = apiMsg.MimeMessage;
                     MailboxAddress sender = MailboxAddress.Parse(
@@ -439,8 +526,11 @@ public RelayResult TryRelayMessage(Message message, MailboxAddress[] overrideRec
 
         private void TrimMessages(Smtp4devDbContext dbContext)
         {
-            dbContext.Messages.RemoveRange(dbContext.Messages.OrderByDescending(m => m.ReceivedDate)
-                .Skip(serverOptions.CurrentValue.NumberOfMessagesToKeep));
+            foreach (var mailbox in dbContext.Mailboxes)
+            {
+                dbContext.Messages.RemoveRange(dbContext.Messages.Where(m => m.Mailbox == mailbox).OrderByDescending(m => m.ReceivedDate)
+                    .Skip(serverOptions.CurrentValue.NumberOfMessagesToKeep));
+            }
         }
 
         private void TrimSessions(Smtp4devDbContext dbContext)
@@ -459,9 +549,9 @@ private void TrimSessions(Smtp4devDbContext dbContext)
 
         public Exception Exception { get; private set; }
 
-        public bool IsRunning => this.smtpServer.IsRunning;
+        public bool IsRunning => this.smtpServer?.IsRunning ?? false;
 
-        public IPEndPoint[] ListeningEndpoints => this.smtpServer.ListeningEndpoints;
+        public IPEndPoint[] ListeningEndpoints => this.smtpServer?.ListeningEndpoints ?? [];
 
         public void TryStart()
         {
@@ -470,6 +560,7 @@ public void TryStart()
                 this.Exception = null;
                 this.lastStartOptions = this.serverOptions.CurrentValue with { };
 
+                DoCleanup();
                 CreateSmtpServer();
                 smtpServer.Start();
 
@@ -479,7 +570,7 @@ public void TryStart()
                         l.Port, l.Address);
                 }
 
-                log.Information("Keeping last {messagesToKeep} messages and {sessionsToKeep} sessions.",
+                log.Information("Keeping last {messagesToKeep} messages per mailbox and {sessionsToKeep} sessions.",
                     serverOptions.CurrentValue.NumberOfMessagesToKeep, serverOptions.CurrentValue.NumberOfSessionsToKeep);
             }
             catch (Exception e)
@@ -495,7 +586,7 @@ public void TryStart()
 
         Task IHostedService.StartAsync(CancellationToken cancellationToken)
         {
-             this.TryStart();
+            this.TryStart();
             return Task.CompletedTask;
         }
 
diff --git a/Rnwood.Smtp4dev/Startup.cs b/Rnwood.Smtp4dev/Startup.cs
index 51f35eacf..2a16bff62 100644
--- a/Rnwood.Smtp4dev/Startup.cs
+++ b/Rnwood.Smtp4dev/Startup.cs
@@ -110,6 +110,8 @@ public void ConfigureServices(IServiceCollection services)
                     });
                     context.SaveChanges();
                 }
+
+
             }, ServiceLifetime.Scoped, ServiceLifetime.Singleton);
 
 
diff --git a/Rnwood.Smtp4dev/appsettings.json b/Rnwood.Smtp4dev/appsettings.json
index e31bbfbe0..702f7eb68 100644
--- a/Rnwood.Smtp4dev/appsettings.json
+++ b/Rnwood.Smtp4dev/appsettings.json
@@ -37,7 +37,7 @@
     // Default value: "database.db"
     "Database": "database.db",
 
-    // Specifies the number of messages to keep
+    // Specifies the number of messages to keep per mailbox
     // Default value: 100
     "NumberOfMessagesToKeep": 100,
 
@@ -136,10 +136,27 @@
     "WebAuthenticationRequired": false,
 
     //List of users for SMTP, IMAP and web interface
+    //DefaultMailbox is name of mailbox that user will get via IMAP
     "Users": [
       //{
       //  "Username": "username",
-      //  "Password": "password"
+      //  "Password": "password",
+      //  "DefaultMailbox": "Sales"
+      //}
+    ],
+
+    //List of mailboxes
+    //Order is important. Each recipient is processed separately and first match gets the message for that recipient.
+    //The message will only be delivered once to each mailbox.
+    //A default mailbox is always included automatically as the last mailbox.
+    //Recipients: List of comma separated wildcards, or regexes surrounded with /
+    //e.g:
+    //    *@somecompany.com, *@*.mycorp.com, boss@bigco.com
+    //    /.*@(somecompany|bigco)\.com/, /user@.*\.com/
+    "Mailboxes": [
+      //{
+      //  "Name": "Default",
+      //  "Recipients": "*"
       //}
     ]
   },
diff --git a/smtpserver/Rnwood.SmtpServer.Tests/Verbs/RcptToVerbTests.cs b/smtpserver/Rnwood.SmtpServer.Tests/Verbs/RcptToVerbTests.cs
index a2a32d3df..71ee06ea2 100644
--- a/smtpserver/Rnwood.SmtpServer.Tests/Verbs/RcptToVerbTests.cs
+++ b/smtpserver/Rnwood.SmtpServer.Tests/Verbs/RcptToVerbTests.cs
@@ -88,7 +88,7 @@ private async Task TestBadAddressAsync(string address, bool asException = false)
             Assert.Equal((int)StandardSmtpResponseCode.SyntaxErrorInCommandArguments, e.SmtpResponse.Code);
         }
 
-        Assert.Equal(0, messageBuilder.Recipients.Count);
+        Assert.Empty(messageBuilder.Recipients);
     }
 
     /// <summary>
diff --git a/smtpserver/Rnwood.SmtpServer/Extensions/Auth/IAuthenticationCredentialsCanValidateWithPassword.cs b/smtpserver/Rnwood.SmtpServer/Extensions/Auth/IAuthenticationCredentialsCanValidateWithPassword.cs
index 78ff690f0..830104e8a 100644
--- a/smtpserver/Rnwood.SmtpServer/Extensions/Auth/IAuthenticationCredentialsCanValidateWithPassword.cs
+++ b/smtpserver/Rnwood.SmtpServer/Extensions/Auth/IAuthenticationCredentialsCanValidateWithPassword.cs
@@ -5,9 +5,20 @@
 
 namespace Rnwood.SmtpServer.Extensions.Auth;
 
+/// <summary>
+/// Represents auth credentials that have a username and which can be validated by the server using the clear text password.
+/// </summary>
 public interface IAuthenticationCredentialsCanValidateWithPassword : IAuthenticationCredentials
 {
+    /// <summary>
+    /// The username
+    /// </summary>
     string Username { get; }
 
+    /// <summary>
+    /// Checks the response using clear text password.
+    /// </summary>
+    /// <param name="password"></param>
+    /// <returns>True if response matches the password.</returns>
     bool ValidateResponse(string password);
 }
diff --git a/smtpserver/Rnwood.SmtpServer/Rnwood.SmtpServer.xml b/smtpserver/Rnwood.SmtpServer/Rnwood.SmtpServer.xml
index cb313081c..6ef6155d4 100644
--- a/smtpserver/Rnwood.SmtpServer/Rnwood.SmtpServer.xml
+++ b/smtpserver/Rnwood.SmtpServer/Rnwood.SmtpServer.xml
@@ -814,6 +814,23 @@
             Gets a string representing the type of this credential.
             </summary>
         </member>
+        <member name="T:Rnwood.SmtpServer.Extensions.Auth.IAuthenticationCredentialsCanValidateWithPassword">
+            <summary>
+            Represents auth credentials that have a username and which can be validated by the server using the clear text password.
+            </summary>
+        </member>
+        <member name="P:Rnwood.SmtpServer.Extensions.Auth.IAuthenticationCredentialsCanValidateWithPassword.Username">
+            <summary>
+            The username
+            </summary>
+        </member>
+        <member name="M:Rnwood.SmtpServer.Extensions.Auth.IAuthenticationCredentialsCanValidateWithPassword.ValidateResponse(System.String)">
+            <summary>
+            Checks the response using clear text password.
+            </summary>
+            <param name="password"></param>
+            <returns>True if response matches the password.</returns>
+        </member>
         <member name="T:Rnwood.SmtpServer.Extensions.Auth.IAuthMechanism">
             <summary>
                 Defines the <see cref="T:Rnwood.SmtpServer.Extensions.Auth.IAuthMechanism" /> which implements a single authentication mechansim for the server.