Merge branch 'release/v1.2.7'

Release v1.2.7
Feature: Allow custom webroot
2026-03-03 17:07:01 +00:00 · 2022-10-31 22:15:25 +13:00 · 2022-10-31 22:15:24 +13:00 · 2022-10-31 22:13:41 +13:00 · 2022-10-29 10:52:22 +13:00 · 2022-10-29 10:23:32 +13:00
41 changed files with 1312 additions and 521 deletions
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -10,10 +10,6 @@ jobs:
    - name: Checkout repository
      uses: actions/checkout@v3

-    - name: Get tag
-      id: tag
-      uses: dawidd6/action-get-tag@v1
-
    - name: Set up QEMU
      uses: docker/setup-qemu-action@v2

@@ -30,8 +26,8 @@ jobs:
      uses: docker/build-push-action@v3
      with:
        context: .
-        platforms: linux/amd64,linux/arm64,linux/arm
+        platforms: linux/386,linux/amd64,linux/arm,linux/arm64
        build-args: |
-          "VERSION=${{ steps.tag.outputs.tag }}"
+          "VERSION=${{ github.ref_name }}"
        push: true
-        tags: axllent/mailpit:latest,axllent/mailpit:${{ steps.tag.outputs.tag }}
+        tags: axllent/mailpit:latest,axllent/mailpit:${{ github.ref_name }}
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -10,24 +10,25 @@ jobs:
    strategy:
      matrix:
        goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm64]
+        goarch: ["386", amd64, arm, arm64]
        exclude:
          - goarch: "386"
            goos: darwin
          - goarch: "386"
            goos: windows
+          - goarch: arm
+            goos: darwin
+          - goarch: arm
+            goos: windows
    steps:
    - uses: actions/checkout@v3

-    - name: Get tag
-      id: tag
-      uses: dawidd6/action-get-tag@v1
-
    # build the assets
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
        cache: 'npm'
+    - run: echo "Building assets for ${{ github.ref_name }}"
    - run: npm install
    - run: npm run package

@@ -42,4 +43,5 @@ jobs:
        asset_name: mailpit-${{ matrix.goos }}-${{ matrix.goarch }}
        extra_files: LICENSE README.md
        md5sum: false
-        ldflags: -w -X "github.com/axllent/mailpit/config.Version=${{ steps.tag.outputs.tag }}"
+        overwrite: true
+        ldflags: -w -X "github.com/axllent/mailpit/config.Version=${{ github.ref_name }}"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,7 +30,7 @@ jobs:
    # build the assets
    - uses: actions/setup-node@v3
      with:
-        node-version: 16
+        node-version: 18
        cache: 'npm'
    - run: npm install
    - run: npm run package
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,46 @@

 Notable changes to Mailpit will be documented in this file.

+## v1.2.7
+
+### Feature
+- Allow custom webroot
+
+
+## v1.2.6
+
+### API
+- Provide structs of API v1 responses for use in client code
+
+### Libs
+- Update go modules
+- Update node modules
+
+
+## 1.2.5
+
+### UI
+- Broadcast "delete all" action to reload all connected clients
+- Load first page if paginated list returns 0 results
+- Theme changes
+- Bump build action to use node 18
+
+
+## 1.2.4
+
+### Bugfix
+- Fix mail download link
+
+
+## 1.2.3
+
+### API
+- Add limit and start parameters to search
+
+### UI
+- Prevent double message index request on websocket connect
+
+
 ## 1.2.2

 ### API
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -6,10 +6,10 @@ import (
 	"strconv"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/server"
 	"github.com/axllent/mailpit/smtpd"
 	"github.com/axllent/mailpit/storage"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/spf13/cobra"
 )

@@ -103,6 +103,9 @@ func init() {
 	if len(os.Getenv("MP_SMTP_SSL_KEY")) > 0 {
 		config.SMTPSSLKey = os.Getenv("MP_SMTP_SSL_KEY")
 	}
+	if len(os.Getenv("MP_WEBROOT")) > 0 {
+		config.Webroot = os.Getenv("MP_WEBROOT")
+	}

 	// deprecated 2022/08/06
 	if len(os.Getenv("MP_AUTH_FILE")) > 0 {
@@ -127,6 +130,7 @@ func init() {
 	rootCmd.Flags().StringVarP(&config.SMTPListen, "smtp", "s", config.SMTPListen, "SMTP bind interface and port")
 	rootCmd.Flags().StringVarP(&config.HTTPListen, "listen", "l", config.HTTPListen, "HTTP bind interface and port for UI")
 	rootCmd.Flags().IntVarP(&config.MaxMessages, "max", "m", config.MaxMessages, "Max number of messages to store")
+	rootCmd.Flags().StringVar(&config.Webroot, "webroot", config.Webroot, "Set the webroot for web UI & API")

 	rootCmd.Flags().StringVar(&config.UIAuthFile, "ui-auth-file", config.UIAuthFile, "A password file for web UI authentication")
 	rootCmd.Flags().StringVar(&config.UISSLCert, "ui-ssl-cert", config.UISSLCert, "SSL certificate for web UI - requires ui-ssl-key")
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -6,7 +6,7 @@ import (
 	"runtime"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/updater"
+	"github.com/axllent/mailpit/utils/updater"
 	"github.com/spf13/cobra"
 )

--- a/config/config.go
+++ b/config/config.go
@@ -3,9 +3,11 @@ package config
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"

 	"github.com/tg123/go-htpasswd"
 )
@@ -44,6 +46,9 @@ var (
 	// UIAuth used for euthentication
 	UIAuth *htpasswd.File

+	// Webroot to define the base path for the UI and API
+	Webroot = "/"
+
 	// SMTPSSLCert file
 	SMTPSSLCert string

@@ -139,6 +144,16 @@ func VerifyConfig() error {
 		SMTPAuth = a
 	}

+	if strings.Contains(Webroot, " ") {
+		return fmt.Errorf("Webroot cannot contain spaces (%s)", Webroot)
+	}
+
+	s, err := url.JoinPath("/", Webroot, "/")
+	if err != nil {
+		return err
+	}
+	Webroot = s
+
 	return nil
 }

--- a/docs/apiv1/Search.md
+++ b/docs/apiv1/Search.md
@@ -4,15 +4,17 @@

 **Method** : `GET`

-The search returns up to 200 of the most recent matches, and does not support pagination or limits.
+The search returns the most recent matches (default 50).
 Matching messages are returned in the order of latest received to oldest.


 ## Query parameters

-| Parameter | Type   | Required | Description  |
-|-----------|--------|----------|--------------|
-| query     | string | true     | Search query |
+| Parameter | Type    | Required | Description                |
+|-----------|---------|----------|----------------------------|
+| query     | string  | true     | Search query               |
+| limit     | integer | false    | Limit results (default 50) |
+| start     | integer | false    | Pagination offset          |


 ## Response
@@ -60,8 +62,8 @@ Matching messages are returned in the order of latest received to oldest.

 - `total` - Total messages in mailbox (all messages, not search)
 - `unread` - Total unread messages in mailbox (all messages, not search)
- `count` - Number of messages returned in request (up to 200 for search)
- `start` - Always 0 (offset in search is unsupported)
+- `count` - Number of messages returned in request
+- `start` - The offset (default `0`) for pagination
 - `From` - Singular Name & Address, or null if none
 - `To`, `CC`, `BCC` - Array of Name & Address, or null if none
 - `Size` - Total size of raw email in bytes
--- a/docs/screenshot.png
+++ b/docs/screenshot.png
--- a/go.mod
+++ b/go.mod
@@ -10,17 +10,17 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/jhillyerd/enmime v0.10.1
 	github.com/k3a/html2text v1.0.8
-	github.com/klauspost/compress v1.15.11
+	github.com/klauspost/compress v1.15.12
 	github.com/leporo/sqlf v1.3.0
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/mhale/smtpd v0.8.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/cobra v1.5.0
+	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/tg123/go-htpasswd v1.2.0
-	golang.org/x/text v0.3.7
-	modernc.org/sqlite v1.19.1
+	golang.org/x/text v0.4.0
+	modernc.org/sqlite v1.19.3
 )

 require (
@@ -43,17 +43,17 @@ require (
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.7.2 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect
-	golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
-	golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/image v0.1.0 // indirect
+	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/net v0.1.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
-	modernc.org/ccgo/v3 v3.16.9 // indirect
-	modernc.org/libc v1.20.2 // indirect
+	modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8 // indirect
+	modernc.org/libc v1.21.4 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.4.0 // indirect
 	modernc.org/opt v0.1.3 // indirect
--- a/go.sum
+++ b/go.sum
@@ -36,7 +36,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
@@ -45,7 +44,6 @@ github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28/go.mod h1:Pcatq5tYkCW
 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -55,7 +53,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
@@ -69,8 +66,8 @@ github.com/k3a/html2text v1.0.8 h1:rVanLhKilpnJUJs/CNKWzMC4YaQINGxK0rSG8ssmnV0=
 github.com/k3a/html2text v1.0.8/go.mod h1:ieEXykM67iT8lTvEWBh6fhpH4B23kB9OMKPdIBmgUqA=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c=
-github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
+github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -80,7 +77,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leporo/sqlf v1.3.0 h1:nAkuPYxMIJg/sUmcd1h4avV5iYo8tBTGEGOIR4BIZO8=
 github.com/leporo/sqlf v1.3.0/go.mod h1:f4dHqIi1+nLl6k1IsNQ8QIEbGWK49th2ei1IxTXk+2E=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -117,8 +113,8 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykE
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
-github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
+github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
+github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
@@ -131,96 +127,81 @@ github.com/tg123/go-htpasswd v1.2.0 h1:UKp34m9H467/xklxUxU15wKRru7fwXoTojtxg25IT
 github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJYLlEUJa2sM=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0=
-golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk=
+golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
+golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210501142056-aec3718b3fa0/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4=
-golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875 h1:AzgQNqF+FKwyQ5LbVrVqOcuuFB67N47F9+htZYH0wFM=
-golang.org/x/sys v0.0.0-20221006211917-84dc82d7e875/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
+golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
 lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
 modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
-modernc.org/ccgo/v3 v3.16.9 h1:AXquSwg7GuMk11pIdw7fmO1Y/ybgazVkMhsZWCV0mHM=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
+modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8 h1:0+dsXf0zeLx9ixj4nilg6jKe5Bg1ilzBwSFq4kJmIUc=
+modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g=
 modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
-modernc.org/libc v1.20.2 h1:9/C6hYLe+SNLricCd+WYkIGatWrQTZegOfmOcz5fPmY=
-modernc.org/libc v1.20.2/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/libc v1.21.4 h1:CzTlumWeIbPV5/HVIMzYHNPCRP8uiU/CWiN2gtd/Qu8=
+modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
 modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
 modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.19.1 h1:8xmS5oLnZtAK//vnd4aTVj8VOeTAccEFOtUnIzfSw+4=
-modernc.org/sqlite v1.19.1/go.mod h1:UfQ83woKMaPW/ZBruK0T7YaFCrI+IE0LeWVY6pmnVms=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
+modernc.org/sqlite v1.19.3 h1:dIoagx6yIQT3V/zOSeAyZ8OqQyEr17YTgETOXTZNJMA=
+modernc.org/sqlite v1.19.3/go.mod h1:xiyJD7FY8mTZXnQwE/gEL1STtFrrnDx03V8KhVQmcr8=
 modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.14.0 h1:cO7oyRWEXweSJmjdbs1L86P52D9QmBy/CPFKmFvNYTU=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
 modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.6.0 h1:gLwAw6aS973K/k9EOJGlofauyMk4YOUiPDYzWnq/oXo=
+modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
--- a/package-lock.json
+++ b/package-lock.json
--- a/sendmail/cmd/cmd.go
+++ b/sendmail/cmd/cmd.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"os/user"

-	"github.com/axllent/mailpit/logger"
+	"github.com/axllent/mailpit/utils/logger"
 	flag "github.com/spf13/pflag"
 )

--- a/server/apiv1/api.go
+++ b/server/apiv1/api.go
@@ -13,17 +13,8 @@ import (
 	"github.com/gorilla/mux"
 )

-// MessagesResult struct
-type MessagesResult struct {
-	Total    int               `json:"total"`
-	Unread   int               `json:"unread"`
-	Count    int               `json:"count"`
-	Start    int               `json:"start"`
-	Messages []storage.Summary `json:"messages"`
-}
-
-// Messages returns a paginated list of messages as JSON
-func Messages(w http.ResponseWriter, r *http.Request) {
+// GetMessages returns a paginated list of messages as JSON
+func GetMessages(w http.ResponseWriter, r *http.Request) {
 	start, limit := getStartLimit(r)

 	messages, err := storage.List(start, limit)
@@ -34,7 +25,7 @@ func Messages(w http.ResponseWriter, r *http.Request) {

 	stats := storage.StatsGet()

-	var res MessagesResult
+	var res MessagesSummary

 	res.Start = start
 	res.Messages = messages
@@ -55,7 +46,9 @@ func Search(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	messages, err := storage.Search(search)
+	start, limit := getStartLimit(r)
+
+	messages, err := storage.Search(search, start, limit)
 	if err != nil {
 		httpError(w, err.Error())
 		return
@@ -63,7 +56,7 @@ func Search(w http.ResponseWriter, r *http.Request) {

 	stats := storage.StatsGet()

-	var res MessagesResult
+	var res MessagesSummary

 	res.Start = 0
 	res.Messages = messages
@@ -76,8 +69,8 @@ func Search(w http.ResponseWriter, r *http.Request) {
 	_, _ = w.Write(bytes)
 }

-// Message (method: GET) returns the *data.Message as JSON
-func Message(w http.ResponseWriter, r *http.Request) {
+// GetMessage (method: GET) returns the *data.Message as JSON
+func GetMessage(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)

 	id := vars["id"]
--- a/server/apiv1/info.go
+++ b/server/apiv1/info.go
@@ -8,7 +8,7 @@ import (

 	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/storage"
-	"github.com/axllent/mailpit/updater"
+	"github.com/axllent/mailpit/utils/updater"
 )

 type appVersion struct {
@@ -26,6 +26,11 @@ func AppInfo(w http.ResponseWriter, r *http.Request) {
 	info := appVersion{}
 	info.Version = config.Version

+	var m runtime.MemStats
+	runtime.ReadMemStats(&m)
+
+	info.Memory = m.Sys - m.HeapReleased
+
 	latest, _, _, err := updater.GithubLatest(config.Repo, config.RepoBinaryName)
 	if err == nil {
 		info.LatestVersion = latest
@@ -40,11 +45,6 @@ func AppInfo(w http.ResponseWriter, r *http.Request) {

 	info.Messages = storage.CountTotal()

-	var m runtime.MemStats
-	runtime.ReadMemStats(&m)
-
-	info.Memory = m.Sys - m.HeapReleased
-
 	bytes, _ := json.Marshal(info)

 	w.Header().Add("Content-Type", "application/json")
--- a/server/apiv1/structs.go
+++ b/server/apiv1/structs.go
@@ -0,0 +1,24 @@
+package apiv1
+
+import "github.com/axllent/mailpit/storage"
+
+// The following structs & aliases are provided for easy import
+// and understanding of the JSON structure.
+
+// MessageSummary - summary of a single message
+type MessageSummary = storage.MessageSummary
+
+// MessagesSummary - summary of a list of messages
+type MessagesSummary struct {
+	Total    int              `json:"total"`
+	Unread   int              `json:"unread"`
+	Count    int              `json:"count"`
+	Start    int              `json:"start"`
+	Messages []MessageSummary `json:"messages"`
+}
+
+// Message data
+type Message = storage.Message
+
+// Attachment summary
+type Attachment = storage.Attachment
--- a/server/apiv1/thumbnails.go
+++ b/server/apiv1/thumbnails.go
@@ -10,8 +10,8 @@ import (
 	"net/http"
 	"strings"

-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/storage"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/disintegration/imaging"
 	"github.com/gorilla/mux"
 	"github.com/jhillyerd/enmime"
--- a/server/server.go
+++ b/server/server.go
@@ -10,9 +10,9 @@ import (
 	"strings"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/server/apiv1"
 	"github.com/axllent/mailpit/server/websockets"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/gorilla/mux"
 )

@@ -34,10 +34,17 @@ func Listen() {
 	r := defaultRoutes()

 	// web UI websocket
-	r.HandleFunc("/api/events", apiWebsocket).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/events", apiWebsocket).Methods("GET")

 	// virtual filesystem for others
-	r.PathPrefix("/").Handler(middlewareHandler(http.FileServer(http.FS(serverRoot))))
+	r.PathPrefix(config.Webroot).Handler(middlewareHandler(http.StripPrefix(config.Webroot, http.FileServer(http.FS(serverRoot)))))
+
+	// redirect to webroot if no trailing slash
+	if config.Webroot != "/" {
+		redir := strings.TrimRight(config.Webroot, "/")
+		r.HandleFunc(redir, middleWareFunc(addSlashToWebroot)).Methods("GET")
+	}
+
 	http.Handle("/", r)

 	if config.UIAuthFile != "" {
@@ -45,10 +52,10 @@ func Listen() {
 	}

 	if config.UISSLCert != "" && config.UISSLKey != "" {
-		logger.Log().Infof("[http] starting secure server on https://%s", config.HTTPListen)
+		logger.Log().Infof("[http] starting secure server on https://%s%s", config.HTTPListen, config.Webroot)
 		logger.Log().Fatal(http.ListenAndServeTLS(config.HTTPListen, config.UISSLCert, config.UISSLKey, nil))
 	} else {
-		logger.Log().Infof("[http] starting server on http://%s", config.HTTPListen)
+		logger.Log().Infof("[http] starting server on http://%s%s", config.HTTPListen, config.Webroot)
 		logger.Log().Fatal(http.ListenAndServe(config.HTTPListen, nil))
 	}
 }
@@ -57,16 +64,16 @@ func defaultRoutes() *mux.Router {
 	r := mux.NewRouter()

 	// API V1
-	r.HandleFunc("/api/v1/messages", middleWareFunc(apiv1.Messages)).Methods("GET")
-	r.HandleFunc("/api/v1/messages", middleWareFunc(apiv1.SetReadStatus)).Methods("PUT")
-	r.HandleFunc("/api/v1/messages", middleWareFunc(apiv1.DeleteMessages)).Methods("DELETE")
-	r.HandleFunc("/api/v1/search", middleWareFunc(apiv1.Search)).Methods("GET")
-	r.HandleFunc("/api/v1/message/{id}/part/{partID}", middleWareFunc(apiv1.DownloadAttachment)).Methods("GET")
-	r.HandleFunc("/api/v1/message/{id}/part/{partID}/thumb", middleWareFunc(apiv1.Thumbnail)).Methods("GET")
-	r.HandleFunc("/api/v1/message/{id}/raw", middleWareFunc(apiv1.DownloadRaw)).Methods("GET")
-	r.HandleFunc("/api/v1/message/{id}/headers", middleWareFunc(apiv1.Headers)).Methods("GET")
-	r.HandleFunc("/api/v1/message/{id}", middleWareFunc(apiv1.Message)).Methods("GET")
-	r.HandleFunc("/api/v1/info", middleWareFunc(apiv1.AppInfo)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/messages", middleWareFunc(apiv1.GetMessages)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/messages", middleWareFunc(apiv1.SetReadStatus)).Methods("PUT")
+	r.HandleFunc(config.Webroot+"api/v1/messages", middleWareFunc(apiv1.DeleteMessages)).Methods("DELETE")
+	r.HandleFunc(config.Webroot+"api/v1/search", middleWareFunc(apiv1.Search)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/message/{id}/part/{partID}", middleWareFunc(apiv1.DownloadAttachment)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/message/{id}/part/{partID}/thumb", middleWareFunc(apiv1.Thumbnail)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/message/{id}/raw", middleWareFunc(apiv1.DownloadRaw)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/message/{id}/headers", middleWareFunc(apiv1.Headers)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/message/{id}", middleWareFunc(apiv1.GetMessage)).Methods("GET")
+	r.HandleFunc(config.Webroot+"api/v1/info", middleWareFunc(apiv1.AppInfo)).Methods("GET")

 	return r
 }
@@ -152,6 +159,11 @@ func middlewareHandler(h http.Handler) http.Handler {
 	})
 }

+// Redirect to webroot
+func addSlashToWebroot(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, config.Webroot, http.StatusFound)
+}
+
 // Websocket to broadcast changes
 func apiWebsocket(w http.ResponseWriter, r *http.Request) {
 	websockets.ServeWs(websockets.MessageHub, w, r)
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -160,7 +160,7 @@ func setup() {
 }

 func assertStatsEqual(t *testing.T, uri string, unread, total int) {
-	m := apiv1.MessagesResult{}
+	m := apiv1.MessagesSummary{}

 	data, err := clientGet(uri)
 	if err != nil {
@@ -179,9 +179,11 @@ func assertStatsEqual(t *testing.T, uri string, unread, total int) {

 func assertSearchEqual(t *testing.T, uri, query string, count int) {
 	t.Logf("Test search: %s", query)
-	m := apiv1.MessagesResult{}
+	m := apiv1.MessagesSummary{}

-	data, err := clientGet(uri + "?query=" + url.QueryEscape(query))
+	limit := fmt.Sprintf("%d", count)
+
+	data, err := clientGet(uri + "?query=" + url.QueryEscape(query) + "&limit=" + limit)
 	if err != nil {
 		t.Errorf(err.Error())
 		return
@@ -224,8 +226,8 @@ func insertEmailData(t *testing.T) {

 }

-func fetchMessages(url string) (apiv1.MessagesResult, error) {
-	m := apiv1.MessagesResult{}
+func fetchMessages(url string) (apiv1.MessagesSummary, error) {
+	m := apiv1.MessagesSummary{}

 	data, err := clientGet(url)
 	if err != nil {
--- a/server/ui-src/App.vue
+++ b/server/ui-src/App.vue
@@ -6,9 +6,11 @@ import Tinycon from 'tinycon';

 export default {
 	mixins: [commonMixins],
+
 	components: {
 		Message
 	},
+
 	data() {
 		return {
 			currentPath: window.location.hash,
@@ -29,9 +31,11 @@ export default {
 			notificationsEnabled: false,
 			selected: [],
 			tcStatus: 0,
-			appInfo : false,
+			appInfo: false,
+			lastLoaded: false
 		}
 	},
+
 	watch: {
 		currentPath(v, old) {
 			if (v && v.match(/^[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+$/)) {
@@ -52,21 +56,23 @@ export default {
 			}
 		}
 	},
+
 	computed: {
 		canPrev: function () {
-            return this.start > 0;
-        },
-        canNext: function () {
-            return this.total > (this.start + this.count);
-        }
+			return this.start > 0;
+		},
+		canNext: function () {
+			return this.total > (this.start + this.count);
+		}
 	},
+
 	mounted() {
 		this.currentPath = window.location.hash.slice(1);
 		window.addEventListener('hashchange', () => {
 			this.currentPath = window.location.hash.slice(1);
 		});

-		this.notificationsSupported = 'https:' == document.location.protocol 
+		this.notificationsSupported = 'https:' == document.location.protocol
 			&& ("Notification" in window && Notification.permission !== "denied");
 		this.notificationsEnabled = this.notificationsSupported && Notification.permission == "granted";

@@ -76,38 +82,50 @@ export default {
 			fallback: false
 		});

-		this.loadMessages();
 		this.connect();
+		this.loadMessages();
 	},
+
 	methods: {
 		loadMessages: function () {
-            let self = this;
-            let params = {};
+			let now = Date.now()
+			// prevent double loading when UI loads & websocket connects
+			if (this.lastLoaded && now - this.lastLoaded < 250) {
+				return;
+			}
+			if (this.start == 0) {
+				this.lastLoaded = now;
+			}
+
+			let self = this;
+			let params = {};
 			this.selected = [];

-            let uri = 'api/v1/messages';
-            if (self.search) {
-                self.searching = true;
+			let uri = 'api/v1/messages';
+			if (self.search) {
+				self.searching = true;
 				self.items = [];
-                uri = 'api/v1/search'
-                self.start = 0; // search is displayed on one page
-                params['query'] = self.search;
-            } else {
+				uri = 'api/v1/search'
+				self.start = 0; // search is displayed on one page
+				params['query'] = self.search;
+				params['limit'] = 200;
+			} else {
 				self.searching = false;
-                params['limit'] = self.limit;
-                if (self.start > 0) {
-                    params['start'] = self.start;
-                }
-            }
+				params['limit'] = self.limit;
+				if (self.start > 0) {
+					params['start'] = self.start;
+				}
+			}

-			self.get(uri, params, function(response){
+			self.get(uri, params, function (response) {
 				self.total = response.data.total;
 				self.unread = response.data.unread;
 				self.count = response.data.count;
 				self.start = response.data.start;
 				self.items = response.data.messages;

-				if (self.items == 0 && self.start > 0) {
+				// if pagination > 0 && results == 0 reload first page (prune)
+				if (response.data.count == 0 && response.data.start > 0) {
 					self.start = 0;
 					return self.loadMessages();
 				}
@@ -119,48 +137,48 @@ export default {
 					}
 				}

-				self.scrollInPlace = false
+				self.scrollInPlace = false;
 			});
-        },
+		},

-		doSearch: function(e) {
+		doSearch: function (e) {
 			e.preventDefault();
 			this.loadMessages();
 		},

-		resetSearch: function(e) {
+		resetSearch: function (e) {
 			e.preventDefault();
 			this.search = '';
 			this.scrollInPlace = true;
 			this.loadMessages();
 		},

-		reloadMessages: function() {
+		reloadMessages: function () {
 			this.search = "";
-            this.start = 0;
+			this.start = 0;
 			this.loadMessages();
 		},

 		viewNext: function () {
-            this.start = parseInt(this.start, 10) + parseInt(this.limit, 10);
-            this.loadMessages();
-        },
+			this.start = parseInt(this.start, 10) + parseInt(this.limit, 10);
+			this.loadMessages();
+		},

-        viewPrev: function () {
-            let s = this.start - this.limit;
-            if (s < 0) {
-                s = 0;
-            }
-            this.start = s;
-            this.loadMessages();
-        },
+		viewPrev: function () {
+			let s = this.start - this.limit;
+			if (s < 0) {
+				s = 0;
+			}
+			this.start = s;
+			this.loadMessages();
+		},

-		openMessage: function(id) {
+		openMessage: function (id) {
 			let self = this;
 			self.selected = [];

-            let uri = 'api/v1/message/' + self.currentPath
-			self.get(uri, false, function(response) {
+			let uri = 'api/v1/message/' + self.currentPath
+			self.get(uri, false, function (response) {
 				for (let i in self.items) {
 					if (self.items[i].ID == self.currentPath) {
 						if (!self.items[i].Read) {
@@ -176,15 +194,15 @@ export default {
 						let a = d.Inline[i];
 						if (a.ContentID != '') {
 							d.HTML = d.HTML.replace(
-								new RegExp('cid:'+a.ContentID, 'g'), 
-								window.location.origin+'/api/v1/message/'+d.ID+'/part/'+a.PartID
+								new RegExp('cid:' + a.ContentID, 'g'),
+								window.location.origin + window.location.pathname + 'api/v1/message/' + d.ID + '/part/' + a.PartID
 							);
 						}
 						if (a.FileName.match(/^[a-zA-Z0-9\_\-\.]+$/)) {
 							// some old email clients use the filename
 							d.HTML = d.HTML.replace(
-								new RegExp('src=(\'|")'+a.FileName+'(\'|")', 'g'), 
-								'src="'+window.location.origin+'/api/v1/message/'+d.ID+'/part/'+a.PartID+'"'
+								new RegExp('src=(\'|")' + a.FileName + '(\'|")', 'g'),
+								'src="' + window.location.origin + window.location.pathname + 'api/v1/message/' + d.ID + '/part/' + a.PartID + '"'
 							);
 						}
 					}
@@ -195,15 +213,15 @@ export default {
 						let a = d.Attachments[i];
 						if (a.ContentID != '') {
 							d.HTML = d.HTML.replace(
-								new RegExp('cid:'+a.ContentID, 'g'), 
-								window.location.origin+'/api/v1/message/'+d.ID+'/part/'+a.PartID
+								new RegExp('cid:' + a.ContentID, 'g'),
+								window.location.origin + window.location.pathname + 'api/v1/message/' + d.ID + '/part/' + a.PartID
 							);
 						}
 						if (a.FileName.match(/^[a-zA-Z0-9\_\-\.]+$/)) {
 							// some old email clients use the filename
 							d.HTML = d.HTML.replace(
-								new RegExp('src=(\'|")'+a.FileName+'(\'|")', 'g'), 
-								'src="'+window.location.origin+'/api/v1/message/'+d.ID+'/part/'+a.PartID+'"'
+								new RegExp('src=(\'|")' + a.FileName + '(\'|")', 'g'),
+								'src="' + window.location.origin + window.location.pathname + 'api/v1/message/' + d.ID + '/part/' + a.PartID + '"'
 							);
 						}
 					}
@@ -228,7 +246,7 @@ export default {
 		},

 		// universal handler to delete current or selected messages
-		deleteMessages: function() {
+		deleteMessages: function () {
 			let ids = [];
 			let self = this;
 			if (self.message) {
@@ -240,65 +258,65 @@ export default {
 				return false;
 			}
 			let uri = 'api/v1/messages';
-			self.delete(uri, {'ids': ids}, function(response) {
+			self.delete(uri, { 'ids': ids }, function (response) {
 				window.location.hash = "";
 				self.scrollInPlace = true;
 				self.loadMessages();
 			});
 		},

-		deleteAll: function() {
+		deleteAll: function () {
 			let self = this;
 			let uri = 'api/v1/messages';
-			self.delete(uri, false, function(response) {
+			self.delete(uri, false, function (response) {
 				window.location.hash = "";
 				self.reloadMessages();
 			});
 		},

-		markUnread: function() {
+		markUnread: function () {
 			let self = this;
 			if (!self.message) {
 				return false;
 			}
 			let uri = 'api/v1/messages';
-			self.put(uri, {'read': false, 'ids': [self.message.ID]}, function(response) {
+			self.put(uri, { 'read': false, 'ids': [self.message.ID] }, function (response) {
 				window.location.hash = "";
 				self.scrollInPlace = true;
 				self.loadMessages();
 			});
 		},

-		markAllRead: function() {
+		markAllRead: function () {
 			let self = this;
 			let uri = 'api/v1/messages'
-			self.put(uri, {'read': true}, function(response) {
+			self.put(uri, { 'read': true }, function (response) {
 				window.location.hash = "";
 				self.scrollInPlace = true;
 				self.loadMessages();
 			});
 		},

-		markSelectedRead: function() {
+		markSelectedRead: function () {
 			let self = this;
 			if (!self.selected.length) {
 				return false;
 			}
 			let uri = 'api/v1/messages';
-			self.put(uri, {'read': true, 'ids': self.selected}, function(response) {
+			self.put(uri, { 'read': true, 'ids': self.selected }, function (response) {
 				window.location.hash = "";
 				self.scrollInPlace = true;
 				self.loadMessages();
 			});
 		},

-		markSelectedUnread: function() {
+		markSelectedUnread: function () {
 			let self = this;
 			if (!self.selected.length) {
 				return false;
 			}
 			let uri = 'api/v1/messages';
-			self.put(uri, {'read': false, 'ids': self.selected}, function(response) {
+			self.put(uri, { 'read': false, 'ids': self.selected }, function (response) {
 				window.location.hash = "";
 				self.scrollInPlace = true;
 				self.loadMessages();
@@ -306,7 +324,7 @@ export default {
 		},

 		// test of any selected emails are unread
-		selectedHasUnread: function() {
+		selectedHasUnread: function () {
 			if (!this.selected.length) {
 				return false;
 			}
@@ -317,9 +335,9 @@ export default {
 			}
 			return false;
 		},
-		
+
 		// test of any selected emails are read
-		selectedHasRead: function() {
+		selectedHasRead: function () {
 			if (!this.selected.length) {
 				return false;
 			}
@@ -332,13 +350,13 @@ export default {
 		},

 		// websocket connect
-        connect: function () {
-            let wsproto = location.protocol == 'https:' ? 'wss' : 'ws';
-            let ws = new WebSocket(
+		connect: function () {
+			let wsproto = location.protocol == 'https:' ? 'wss' : 'ws';
+			let ws = new WebSocket(
 				wsproto + "://" + document.location.host + document.location.pathname + "api/events"
 			);
-            let self = this;
-            ws.onmessage = function (e) {
+			let self = this;
+			ws.onmessage = function (e) {
 				let response = JSON.parse(e.data);
 				if (!response) {
 					return;
@@ -346,7 +364,7 @@ export default {
 				// new messages
 				if (response.Type == "new" && response.Data) {
 					if (!self.searching) {
-                		if (self.start < 1) {
+						if (self.start < 1) {
 							self.items.unshift(response.Data);
 							if (self.items.length > self.limit) {
 								self.items.pop();
@@ -355,36 +373,36 @@ export default {
 							self.start++;
 						}
 					}
-	                self.total++;
+					self.total++;
 					self.unread++;
 					let from = response.Data.From != null ? response.Data.From.Address : '[unknown]';
 					self.browserNotify("New mail from: " + from, response.Data.Subject);
-                } else if (response.Type == "prune") {
+				} else if (response.Type == "prune") {
 					// messages have been deleted, reload messages to adjust
 					self.scrollInPlace = true;
 					self.loadMessages();
 				}
-            }
+			}

-            ws.onopen = function () {
-                self.isConnected = true;
+			ws.onopen = function () {
+				self.isConnected = true;
 				self.loadMessages();
-            }
+			}
+
+			ws.onclose = function (e) {
+				self.isConnected = false;

-            ws.onclose = function (e) {
-                self.isConnected = false;
-				
 				setTimeout(function () {
 					self.connect(); // reconnect
 				}, 1000);
-            }
+			}

-            ws.onerror = function (err) {
-                ws.close();
-            }
-        },
+			ws.onerror = function (err) {
+				ws.close();
+			}
+		},

-		getPrimaryEmailTo: function(message) {
+		getPrimaryEmailTo: function (message) {
 			for (let i in message.To) {
 				return message.To[i].Address;
 			}
@@ -392,12 +410,12 @@ export default {
 			return '[ Undisclosed recipients ]';
 		},

-		getRelativeCreated: function(message) {
-            let d = new Date(message.Created)
-            return moment(d).fromNow().toString();
-        },
+		getRelativeCreated: function (message) {
+			let d = new Date(message.Created)
+			return moment(d).fromNow().toString();
+		},

-		browserNotify: function(title, message) {
+		browserNotify: function (title, message) {
 			if (!("Notification" in window)) {
 				return;
 			}
@@ -412,7 +430,7 @@ export default {
 			}
 		},

-		requestNotifications: function() {
+		requestNotifications: function () {
 			// check if the browser supports notifications
 			if (!("Notification" in window)) {
 				alert("This browser does not support desktop notification");
@@ -431,28 +449,28 @@ export default {
 			}
 		},

-		toggleSelected: function(e, id) {
+		toggleSelected: function (e, id) {
 			e.preventDefault();
-			
+
 			if (this.isSelected(id)) {
-				this.selected =  this.selected.filter(function(ele){ 
-					return ele != id; 
+				this.selected = this.selected.filter(function (ele) {
+					return ele != id;
 				});
 			} else {
 				this.selected.push(id);
 			}
 		},

-		selectRange: function(e, id) {
+		selectRange: function (e, id) {
 			e.preventDefault();

 			let selecting = false;
 			let lastSelected = this.selected.length > 0 && this.selected[this.selected.length - 1];
 			if (lastSelected == id) {
-				this.selected =  this.selected.filter(function(ele){ 
-					return ele != id; 
+				this.selected = this.selected.filter(function (ele) {
+					return ele != id;
 				});
-				return
+				return;
 			}

 			if (lastSelected === false) {
@@ -478,14 +496,14 @@ export default {
 			}
 		},

-		isSelected: function(id) {
+		isSelected: function (id) {
 			return this.selected.indexOf(id) != -1;
 		},

-		loadInfo: function(e) {
+		loadInfo: function (e) {
 			e.preventDefault();
 			let self = this;
-			self.get('api/v1/info', false, function(response) {
+			self.get('api/v1/info', false, function (response) {
 				self.appInfo = response.data;
 				self.modal('AppInfoModal').show();
 			});
@@ -495,36 +513,39 @@ export default {
 </script>

 <template>
-	<div class="navbar navbar-expand-lg navbar-light row flex-shrink-0 bg-light shadow-sm">
+	<div class="navbar navbar-expand-lg navbar-dark row flex-shrink-0 bg-primary text-white">
 		<div class="col-lg-2 col-md-3 d-none d-md-block">
-			<a class="navbar-brand" href="#" v-on:click="reloadMessages">
+			<a class="navbar-brand text-white" href="#" v-on:click="reloadMessages">
 				<img src="mailpit.svg" alt="Mailpit">
 				<span class="ms-2">Mailpit</span>
 			</a>
 		</div>
-		
+
 		<div class="col col-md-9 col-lg-10" v-if="message">
-			<a class="btn btn-outline-secondary me-4 px-3" href="#" v-on:click="message=false" title="Return to messages">
+			<a class="btn btn-outline-light me-4 px-3" href="#" v-on:click="message = false" title="Return to messages">
 				<i class="bi bi-arrow-return-left"></i>
 			</a>
-			<button class="btn btn-outline-secondary me-2" title="Mark unread" v-on:click="markUnread">
+			<button class="btn btn-outline-light me-2" title="Mark unread" v-on:click="markUnread">
 				<i class="bi bi-eye-slash"></i> <span class="d-none d-md-inline">Mark unread</span>
 			</button>
-			<button class="btn btn-outline-secondary me-2" title="Delete message" v-on:click="deleteMessages">
+			<button class="btn btn-outline-light me-2" title="Delete message" v-on:click="deleteMessages">
 				<i class="bi bi-trash-fill"></i> <span class="d-none d-md-inline">Delete</span>
 			</button>
-			<a class="btn btn-outline-secondary float-end" :class="messageNext ? '':'disabled'" :href="'#'+messageNext" title="View next message">
+			<a class="btn btn-outline-light float-end" :class="messageNext ? '' : 'disabled'" :href="'#' + messageNext"
+				title="View next message">
 				<i class="bi bi-caret-right-fill"></i>
 			</a>
-			<a class="btn btn-outline-secondary ms-2 me-1 float-end" :class="messagePrev ? '': 'disabled'" :href="'#'+messagePrev" title="View previous message">
+			<a class="btn btn-outline-light ms-2 me-1 float-end" :class="messagePrev ? '' : 'disabled'"
+				:href="'#' + messagePrev" title="View previous message">
 				<i class="bi bi-caret-left-fill"></i>
 			</a>
-			<a :href="'api/v1/' + message.ID + '/raw?dl=1'" class="btn btn-outline-secondary me-2 float-end" title="Download message">
+			<a :href="'api/v1/message/' + message.ID + '/raw?dl=1'" class="btn btn-outline-light me-2 float-end"
+				title="Download message">
 				<i class="bi bi-file-arrow-down-fill"></i> <span class="d-none d-md-inline">Download</span>
 			</a>
 		</div>

-		<div class="col col-md-9 col-lg-5 LOL" v-if="!message">
+		<div class="col col-md-9 col-lg-5" v-if="!message">
 			<form v-on:submit="doSearch">
 				<div class="input-group">
 					<a class="navbar-brand d-md-none" href="#" v-on:click="reloadMessages">
@@ -532,24 +553,29 @@ export default {
 						<span v-if="!total" class="ms-2">Mailpit</span>
 					</a>
 					<div v-if="total" class="d-flex bg-white border rounded-start flex-fill position-relative">
-						<input type="text" class="form-control border-0" v-model.trim="search" placeholder="Search mailbox">
-						<span class="btn btn-link position-absolute end-0 text-muted" v-if="search" v-on:click="resetSearch"><i class="bi bi-x-circle"></i></span>
+						<input type="text" class="form-control border-0" v-model.trim="search"
+							placeholder="Search mailbox">
+						<span class="btn btn-link position-absolute end-0 text-muted" v-if="search"
+							v-on:click="resetSearch"><i class="bi bi-x-circle"></i></span>
 					</div>
-					<button v-if="total" class="btn btn-outline-secondary" type="submit"><i class="bi bi-search"></i></button>
+					<button v-if="total" class="btn btn-outline-light" type="submit"><i
+							class="bi bi-search"></i></button>
 				</div>
 			</form>
 		</div>
 		<div class="col-12 col-lg-5 text-end mt-2 mt-lg-0" v-if="!message && total">
-			<button v-if="total" class="btn btn-outline-danger float-start d-md-none me-2" data-bs-toggle="modal" data-bs-target="#DeleteAllModal" title="Delete all messages">
+			<button v-if="total" class="btn btn-danger float-start d-md-none me-2" data-bs-toggle="modal"
+				data-bs-target="#DeleteAllModal" title="Delete all messages">
 				<i class="bi bi-trash-fill"></i>
 			</button>

-			<button v-if="unread" class="btn btn-outline-primary float-start d-md-none" data-bs-toggle="modal" data-bs-target="#MarkAllReadModal" title="Mark all read">
+			<button v-if="unread" class="btn btn-light float-start d-md-none" data-bs-toggle="modal"
+				data-bs-target="#MarkAllReadModal" title="Mark all read">
 				<i class="bi bi-check2-square"></i>
 			</button>

-			<select v-model="limit" v-on:change="loadMessages"
-				class="form-select form-select-sm d-inline w-auto me-2" v-if="!searching">
+			<select v-model="limit" v-on:change="loadMessages" class="form-select form-select-sm d-inline w-auto me-2"
+				v-if="!searching">
 				<option value="25">25</option>
 				<option value="50">50</option>
 				<option value="100">100</option>
@@ -560,12 +586,16 @@ export default {
 			</span>
 			<span v-else>
 				<small>
-					<b>{{ formatNumber(start + 1) }}-{{ formatNumber(start + items.length) }}</b> of <b>{{ formatNumber(total) }}</b>
+					{{ formatNumber(start + 1) }}-{{ formatNumber(start + items.length) }} <small>of</small> {{
+							formatNumber(total)
+					}}
 				</small>
-				<button class="btn btn-outline-secondary ms-2 me-1" :disabled="!canPrev" v-on:click="viewPrev" v-if="!searching" :title="'View previous '+limit+' messages'">
+				<button class="btn btn-outline-light ms-2 me-1" :disabled="!canPrev" v-on:click="viewPrev"
+					v-if="!searching" :title="'View previous ' + limit + ' messages'">
 					<i class="bi bi-caret-left-fill"></i>
 				</button>
-				<button class="btn btn-outline-secondary" :disabled="!canNext" v-on:click="viewNext" v-if="!searching" :title="'View next '+limit+' messages'">
+				<button class="btn btn-outline-light" :disabled="!canNext" v-on:click="viewNext" v-if="!searching"
+					:title="'View next ' + limit + ' messages'">
 					<i class="bi bi-caret-right-fill"></i>
 				</button>
 			</span>
@@ -574,7 +604,7 @@ export default {
 	<div class="row flex-fill" style="min-height:0">
 		<div class="d-none d-md-block col-lg-2 col-md-3 mh-100 position-relative" style="overflow-y: auto;">
 			<ul class="list-unstyled mt-3 mb-5">
-				<li v-if="isConnected" title="Messages will auto-load" class="mb-3">
+				<li v-if="isConnected" title="Messages will auto-load" class="mb-3 text-muted">
 					<i class="bi bi-power text-success"></i>
 					Connected
 				</li>
@@ -586,7 +616,7 @@ export default {
 					<a class="position-relative ps-0" href="#" v-on:click="reloadMessages">
 						<i class="bi bi-envelope me-1" v-if="isConnected"></i>
 						<i class="bi bi-arrow-clockwise me-1" v-else></i>
-						Inbox 
+						Inbox
 						<span class="badge rounded-pill text-bg-primary ms-1" title="Unread messages" v-if="unread">
 							{{ formatNumber(unread) }}
 						</span>
@@ -606,8 +636,9 @@ export default {
 				</li>

 				<li class="my-3" v-if="selected.length > 0">
-					<b class="me-2">Selected {{selected.length}}</b>
-					<button class="btn btn-sm text-muted" v-on:click="selected=[]" title="Unselect messages"><i class="bi bi-x-circle"></i></button>
+					<b class="me-2">Selected {{ selected.length }}</b>
+					<button class="btn btn-sm text-muted" v-on:click="selected = []" title="Unselect messages"><i
+							class="bi bi-x-circle"></i></button>
 				</li>
 				<li class="my-3 ms-2" v-if="selected.length > 0 && selectedHasUnread()">
 					<a href="#" v-on:click="markSelectedRead">
@@ -629,7 +660,8 @@ export default {
 				</li>

 				<li class="my-3" v-if="notificationsSupported && !notificationsEnabled">
-					<a href="#" data-bs-toggle="modal" data-bs-target="#EnableNotificationsModal" title="Enable browser notifications">
+					<a href="#" data-bs-toggle="modal" data-bs-target="#EnableNotificationsModal"
+						title="Enable browser notifications">
 						<i class="bi bi-bell"></i>
 						Enable alerts
 					</a>
@@ -644,27 +676,32 @@ export default {
 		</div>

 		<div class="col-lg-10 col-md-9 mh-100 pe-0">
-			<div class="mh-100" style="overflow-y: auto;" :class="message ? 'd-none':''" id="message-page">
-				<div class="list-group" v-if="items.length">
-					<a v-for="message in items" :href="'#'+message.ID" 
-						v-on:click.ctrl="toggleSelected($event, message.ID)" v-on:click.shift="selectRange($event, message.ID)" 
+			<div class="mh-100" style="overflow-y: auto;" :class="message ? 'd-none' : ''" id="message-page">
+				<div class="list-group my-2" v-if="items.length">
+					<a v-for="message in items" :href="'#' + message.ID"
+						v-on:click.ctrl="toggleSelected($event, message.ID)"
+						v-on:click.shift="selectRange($event, message.ID)"
 						class="row message d-flex small list-group-item list-group-item-action border-start-0 border-end-0"
-						:class="message.Read ? 'read':'', isSelected(message.ID) ? 'selected':''">
+						:class="message.Read ? 'read' : '', isSelected(message.ID) ? 'selected' : ''">
 						<div class="col-lg-3">
 							<div class="d-lg-none float-end text-muted text-nowrap small">
 								<i class="bi bi-paperclip h6 me-1" v-if="message.Attachments"></i>
 								{{ getRelativeCreated(message) }}
 							</div>
 							<div class="text-truncate d-lg-none privacy">
-								<span v-if="message.From" :title="message.From.Address">{{ message.From.Name ? message.From.Name : message.From.Address }}</span>
-							</div> 
+								<span v-if="message.From" :title="message.From.Address">{{ message.From.Name ?
+										message.From.Name : message.From.Address
+								}}</span>
+							</div>
 							<div class="text-truncate d-none d-lg-block privacy">
-								<b v-if="message.From" :title="message.From.Address">{{ message.From.Name ? message.From.Name : message.From.Address }}</b>
+								<b v-if="message.From" :title="message.From.Address">{{ message.From.Name ?
+										message.From.Name : message.From.Address
+								}}</b>
 							</div>
 							<div class="d-none d-lg-block text-truncate text-muted small privacy">
 								{{ getPrimaryEmailTo(message) }}
 								<span v-if="message.To && message.To.length > 1">
-									[+{{message.To.length - 1}}]
+									[+{{ message.To.length - 1 }}]
 								</span>
 							</div>
 						</div>
@@ -713,15 +750,17 @@ export default {
 					This will permanently delete {{ formatNumber(total) }} message<span v-if="total > 1">s</span>.
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-danger" data-bs-dismiss="modal" v-on:click="deleteAll">Delete</button>
+					<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
+					<button type="button" class="btn btn-danger" data-bs-dismiss="modal"
+						v-on:click="deleteAll">Delete</button>
 				</div>
 			</div>
 		</div>
 	</div>

 	<!-- Modal -->
-	<div class="modal fade" id="MarkAllReadModal" tabindex="-1" aria-labelledby="MarkAllReadModalLabel" aria-hidden="true">
+	<div class="modal fade" id="MarkAllReadModal" tabindex="-1" aria-labelledby="MarkAllReadModalLabel"
+		aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -732,15 +771,17 @@ export default {
 					This will mark {{ formatNumber(unread) }} message<span v-if="unread > 1">s</span> as read.
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-primary" data-bs-dismiss="modal" v-on:click="markAllRead">Confirm</button>
+					<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
+					<button type="button" class="btn btn-success" data-bs-dismiss="modal"
+						v-on:click="markAllRead">Confirm</button>
 				</div>
 			</div>
 		</div>
 	</div>

 	<!-- Modal -->
-	<div class="modal fade" id="EnableNotificationsModal" tabindex="-1" aria-labelledby="EnableNotificationsModalLabel" aria-hidden="true">
+	<div class="modal fade" id="EnableNotificationsModal" tabindex="-1" aria-labelledby="EnableNotificationsModalLabel"
+		aria-hidden="true">
 		<div class="modal-dialog modal-lg">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -750,13 +791,15 @@ export default {
 				<div class="modal-body">
 					<p class="h4">Get browser notifications when Mailpit receives a new mail?</p>
 					<p>
-						Note that your browser will ask you for confirmation when you click <code>enable notifications</code>,
+						Note that your browser will ask you for confirmation when you click
+						<code>enable notifications</code>,
 						and that you must have Mailpit open in a browser tab to be able to receive the notifications.
 					</p>
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-primary" data-bs-dismiss="modal" v-on:click="requestNotifications">Enable notifications</button>
+					<button type="button" class="btn btn-primary" data-bs-dismiss="modal"
+						v-on:click="requestNotifications">Enable notifications</button>
 				</div>
 			</div>
 		</div>
@@ -775,7 +818,7 @@ export default {
 				</div>
 				<div class="modal-body">
 					<a class="btn btn-warning d-block mb-3" v-if="appInfo.Version != appInfo.LatestVersion"
-						:href="'https://github.com/axllent/mailpit/releases/tag/'+appInfo.LatestVersion">
+						:href="'https://github.com/axllent/mailpit/releases/tag/' + appInfo.LatestVersion">
 						A new version of Mailpit ({{ appInfo.LatestVersion }}) is available.
 					</a>

@@ -788,7 +831,8 @@ export default {
 							</a>
 						</div>
 						<div class="col-sm-6">
-							<a class="btn btn-primary w-100" href="https://github.com/axllent/mailpit/wiki" target="_blank">
+							<a class="btn btn-primary w-100" href="https://github.com/axllent/mailpit/wiki"
+								target="_blank">
 								Documentation
 								<i class="bi bi-box-arrow-up-right"></i>
 							</a>
--- a/server/ui-src/app.js
+++ b/server/ui-src/app.js
@@ -5,4 +5,4 @@ import "./assets/styles.scss";
 import "../../node_modules/bootstrap-icons/font/bootstrap-icons.scss";
 import "bootstrap";

-createApp(App).mount('#app')
+createApp(App).mount('#app');
--- a/server/ui-src/assets/_bootstrap_variables.scss
+++ b/server/ui-src/assets/_bootstrap_variables.scss
@@ -1,2 +1,2 @@
 $link-decoration: none;
-$primary: #3465b5;
+$primary: #2c3e50;
--- a/server/ui-src/assets/styles.scss
+++ b/server/ui-src/assets/styles.scss
@@ -9,6 +9,7 @@

    .navbar-brand {
        color: #2d4a5d;
+        transition: all 0.2s;

        img {
            width: 40px;
@@ -24,6 +25,19 @@
    }
 }

+.navbar-brand {
+    span {
+        opacity: 0.8;
+        transition: all 0.5s;
+    }
+
+    &:hover {
+        span {
+            opacity: 1;
+        }
+    }
+}
+
 #loading {
    position: absolute;
    top: 0;
@@ -76,11 +90,10 @@
 }

 .message.selected {
-    background: $primary;
-    color: #fff;
+    background: $gray-300;

    .text-muted {
-        color: #fff !important;
+        color: $body-color !important;
    }

    &.read {
--- a/server/ui-src/mixins.js
+++ b/server/ui-src/mixins.js
@@ -12,7 +12,7 @@ FakeModal.prototype.show = function () { alert('open fake modal') }
 const commonMixins = {
 	data() {
 		return {
-			loading: 0,
+			loading: 0
 		}
 	},

@@ -211,4 +211,4 @@ const commonMixins = {
 }


-export default commonMixins
+export default commonMixins;
--- a/server/ui-src/templates/Message.vue
+++ b/server/ui-src/templates/Message.vue
@@ -28,14 +28,13 @@ export default {
 			handler(newQuestion) {
 				let self = this;
 				// delay 100ms to select first tab and add HTML highlighting (prev/next)
-				window.setTimeout(function() {
+				window.setTimeout(function () {
 					self.renderUI();
 				}, 100)
 			},
 			// force eager callback execution
 			immediate: true
 		}
-
 	},

 	mounted() {
@@ -47,20 +46,20 @@ export default {
 			self.srcURI = 'api/v1/message/' + self.message.ID + '/raw';
 		});
 	},
-	
-	unmounted: function() {
+
+	unmounted: function () {
 		window.removeEventListener("resize", this.resizeIframes);
 	},

 	methods: {
-		renderUI: function() {
+		renderUI: function () {
 			let self = this;
 			// click the first non-disabled tab
 			document.querySelector('#nav-tab button:not([disabled])').click();
 			document.activeElement.blur(); // blur focus
 			document.getElementById('message-view').scrollTop = 0;

-			window.setTimeout(function(){
+			window.setTimeout(function () {
 				let p = document.getElementById('preview-html');

 				if (p) {
@@ -83,13 +82,13 @@ export default {
 			window.Prism.manual = true;
 			Prism.highlightAll();
 		},
-		
-		resizeIframe: function(el) {
+
+		resizeIframe: function (el) {
 			let i = el.target;
 			i.style.height = i.contentWindow.document.body.scrollHeight + 50 + 'px';
 		},

-		resizeIframes: function() {
+		resizeIframes: function () {
 			let h = document.getElementById('preview-html');
 			if (h) {
 				h.style.height = h.contentWindow.document.body.scrollHeight + 50 + 'px';
@@ -101,7 +100,7 @@ export default {
 			}
 		},

-		messageDate: function(d) {
+		messageDate: function (d) {
 			return moment(d).format('ddd, D MMM YYYY, h:mm a');
 		}
 	}
@@ -168,7 +167,8 @@ export default {
 			<div class="col-md-auto text-md-end mt-md-3">
 				<p class="text-muted small d-none d-md-block"><small>{{ messageDate(message.Date) }}</small></p>
 				<div class="dropdown mt-2" v-if="allAttachments(message)">
-					<button class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+					<button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown"
+						aria-expanded="false">
 						Attachment<span v-if="allAttachments(message).length > 1">s</span>
 						({{ allAttachments(message).length }})
 					</button>
@@ -188,41 +188,40 @@ export default {

 		<nav>
 			<div class="nav nav-tabs my-3" id="nav-tab" role="tablist">
-				<button class="nav-link" id="nav-html-tab" data-bs-toggle="tab"
-					data-bs-target="#nav-html" type="button" role="tab" aria-controls="nav-html"
-					aria-selected="true" v-if="message.HTML">HTML</button>
-				<button class="nav-link" id="nav-html-source-tab" data-bs-toggle="tab"
-					data-bs-target="#nav-html-source" type="button" role="tab" aria-controls="nav-html-source"
-					aria-selected="false" v-if="message.HTML">HTML Source</button>
-				<button class="nav-link" id="nav-plain-text-tab" data-bs-toggle="tab"
-					data-bs-target="#nav-plain-text" type="button" role="tab" aria-controls="nav-plain-text"
-					aria-selected="false" :class="message.HTML == '' ? 'show':''">Text</button>
-				<button class="nav-link" id="nav-raw-tab" data-bs-toggle="tab"
-					data-bs-target="#nav-raw" type="button" role="tab" aria-controls="nav-raw"
-					aria-selected="false">Raw</button>
+				<button class="nav-link" id="nav-html-tab" data-bs-toggle="tab" data-bs-target="#nav-html" type="button"
+					role="tab" aria-controls="nav-html" aria-selected="true" v-if="message.HTML">HTML</button>
+				<button class="nav-link" id="nav-html-source-tab" data-bs-toggle="tab" data-bs-target="#nav-html-source"
+					type="button" role="tab" aria-controls="nav-html-source" aria-selected="false"
+					v-if="message.HTML">HTML Source</button>
+				<button class="nav-link" id="nav-plain-text-tab" data-bs-toggle="tab" data-bs-target="#nav-plain-text"
+					type="button" role="tab" aria-controls="nav-plain-text" aria-selected="false"
+					:class="message.HTML == '' ? 'show':''">Text</button>
+				<button class="nav-link" id="nav-raw-tab" data-bs-toggle="tab" data-bs-target="#nav-raw" type="button"
+					role="tab" aria-controls="nav-raw" aria-selected="false">Raw</button>
 			</div>
 		</nav>
 		<div class="tab-content mb-5" id="nav-tabContent">
 			<div v-if="message.HTML != ''" class="tab-pane fade show" id="nav-html" role="tabpanel"
 				aria-labelledby="nav-html-tab" tabindex="0">
-				<iframe target-blank="" class="tab-pane" id="preview-html" :srcdoc="message.HTML" v-on:load="resizeIframe"
-					seamless frameborder="0" style="width: 100%; height: 100%;">
+				<iframe target-blank="" class="tab-pane" id="preview-html" :srcdoc="message.HTML"
+					v-on:load="resizeIframe" seamless frameborder="0" style="width: 100%; height: 100%;">
 				</iframe>
-				<Attachments v-if="allAttachments(message).length" :message="message" :attachments="allAttachments(message)"></Attachments>
+				<Attachments v-if="allAttachments(message).length" :message="message"
+					:attachments="allAttachments(message)"></Attachments>
 			</div>
-			<div class="tab-pane fade" id="nav-html-source" role="tabpanel"
-				aria-labelledby="nav-html-source-tab" tabindex="0" v-if="message.HTML">
+			<div class="tab-pane fade" id="nav-html-source" role="tabpanel" aria-labelledby="nav-html-source-tab"
+				tabindex="0" v-if="message.HTML">
 				<pre><code class="language-html">{{ message.HTML }}</code></pre>
 			</div>
-			<div class="tab-pane fade" id="nav-plain-text" role="tabpanel"
-				aria-labelledby="nav-plain-text-tab" tabindex="0" :class="message.HTML == '' ? 'show':''">
+			<div class="tab-pane fade" id="nav-plain-text" role="tabpanel" aria-labelledby="nav-plain-text-tab"
+				tabindex="0" :class="message.HTML == '' ? 'show':''">
 				<div class="text-view">{{ message.Text }}</div>
-				<Attachments v-if="allAttachments(message).length" :message="message" :attachments="allAttachments(message)"></Attachments>
+				<Attachments v-if="allAttachments(message).length" :message="message"
+					:attachments="allAttachments(message)"></Attachments>
 			</div>
-			<div class="tab-pane fade" id="nav-raw" role="tabpanel" aria-labelledby="nav-raw-tab"
-				tabindex="0">
-				<iframe v-if="srcURI" :src="srcURI" v-on:load="resizeIframe"
-					seamless frameborder="0" style="width: 100%; height: 300px;" id="message-src"></iframe>
+			<div class="tab-pane fade" id="nav-raw" role="tabpanel" aria-labelledby="nav-raw-tab" tabindex="0">
+				<iframe v-if="srcURI" :src="srcURI" v-on:load="resizeIframe" seamless frameborder="0"
+					style="width: 100%; height: 300px;" id="message-src"></iframe>
 			</div>
 		</div>
 	</div>
--- a/server/ui/favicon.svg
+++ b/server/ui/favicon.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="500"
+   height="460"
+   viewBox="0 0 132.292 121.708"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="favicon.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.80851684"
+     inkscape:cx="401.9706"
+     inkscape:cy="327.76064"
+     inkscape:window-width="1554"
+     inkscape:window-height="838"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M12.321 0l53.861 53.918L120.365 0zM5.155 9.025l60.842 59.673 61.211-59.489-.185 36.835L66.921 70.54l15.164 12.616-8.137 5.986-41.609.184c-4.838-.022-25.877-18.34-27.185-41.255z"
+     fill-opacity=".941"
+     fill="#2d4a5f"
+     id="path2"
+     style="fill:#415066;fill-opacity:1"
+     inkscape:export-filename="/mnt/apache/sandpit/go/mailpit/server/ui/mailpit.png"
+     inkscape:export-xdpi="12.29"
+     inkscape:export-ydpi="12.29" />
+  <path
+     d="M78.385 72.049l53.907-21.679-8.031 57.318-11.845-9.132c-21.727 23.171-45.255 26.289-67.997 20.837S12.281 98.39 5.155 83.8-.67 53.116 2.843 38.769c1.13 10.511-1.313 16.316 6.38 33.612 6.31 11.399 14.413 20.417 25.89 24.956 13.9 6.195 32.247 3.357 41.701-3.039l14.24-12.156z"
+     fill="#00b786"
+     id="path4"
+     inkscape:export-filename="/mnt/apache/sandpit/go/mailpit/server/ui/mailpit.png"
+     inkscape:export-xdpi="12.29"
+     inkscape:export-ydpi="12.29" />
+</svg>
--- a/server/ui/index.html
+++ b/server/ui/index.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<meta name="referrer" content="no-referrer">
 	<meta name="robots" content="noindex, nofollow, noarchive">
-	<link rel="icon" href="mailpit.svg">
+	<link rel="icon" href="favicon.svg">
 	<title>Mailpit</title>
 	<link rel=stylesheet href="dist/app.css">
 </head>
--- a/server/ui/mailpit.png
+++ b/server/ui/mailpit.png
--- a/server/ui/mailpit.svg
+++ b/server/ui/mailpit.svg
@@ -1 +1,50 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="500" height="460" viewBox="0 0 132.292 121.708" xmlns:v="https://vecta.io/nano"><path d="M12.321 0l53.861 53.918L120.365 0zM5.155 9.025l60.842 59.673 61.211-59.489-.185 36.835L66.921 70.54l15.164 12.616-8.137 5.986-41.609.184c-4.838-.022-25.877-18.34-27.185-41.255z" fill-opacity=".941" fill="#2d4a5f"/><path d="M78.385 72.049l53.907-21.679-8.031 57.318-11.845-9.132c-21.727 23.171-45.255 26.289-67.997 20.837S12.281 98.39 5.155 83.8-.67 53.116 2.843 38.769c1.13 10.511-1.313 16.316 6.38 33.612 6.31 11.399 14.413 20.417 25.89 24.956 13.9 6.195 32.247 3.357 41.701-3.039l14.24-12.156z" fill="#00b786"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="500"
+   height="460"
+   viewBox="0 0 132.292 121.708"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="mailpit.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.80851684"
+     inkscape:cx="401.35218"
+     inkscape:cy="327.76064"
+     inkscape:window-width="1554"
+     inkscape:window-height="838"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M12.321 0l53.861 53.918L120.365 0zM5.155 9.025l60.842 59.673 61.211-59.489-.185 36.835L66.921 70.54l15.164 12.616-8.137 5.986-41.609.184c-4.838-.022-25.877-18.34-27.185-41.255z"
+     fill-opacity=".941"
+     fill="#2d4a5f"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1"
+     inkscape:export-filename="/mnt/apache/sandpit/go/mailpit/server/ui/mailpit.png"
+     inkscape:export-xdpi="12.29"
+     inkscape:export-ydpi="12.29" />
+  <path
+     d="M78.385 72.049l53.907-21.679-8.031 57.318-11.845-9.132c-21.727 23.171-45.255 26.289-67.997 20.837S12.281 98.39 5.155 83.8-.67 53.116 2.843 38.769c1.13 10.511-1.313 16.316 6.38 33.612 6.31 11.399 14.413 20.417 25.89 24.956 13.9 6.195 32.247 3.357 41.701-3.039l14.24-12.156z"
+     fill="#00b786"
+     id="path4"
+     inkscape:export-filename="/mnt/apache/sandpit/go/mailpit/server/ui/mailpit.png"
+     inkscape:export-xdpi="12.29"
+     inkscape:export-ydpi="12.29" />
+</svg>
--- a/server/websockets/client.go
+++ b/server/websockets/client.go
@@ -9,7 +9,7 @@ import (
 	"time"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/gorilla/websocket"
 )

--- a/server/websockets/hub.go
+++ b/server/websockets/hub.go
@@ -7,7 +7,7 @@ package websockets
 import (
 	"encoding/json"

-	"github.com/axllent/mailpit/logger"
+	"github.com/axllent/mailpit/utils/logger"
 )

 // Hub maintains the set of active clients and broadcasts messages to the
--- a/smtpd/smtpd.go
+++ b/smtpd/smtpd.go
@@ -7,8 +7,8 @@ import (
 	"regexp"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/storage"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/mhale/smtpd"
 )

--- a/storage/database.go
+++ b/storage/database.go
@@ -1,3 +1,4 @@
+// Package storage handles all database actions
 package storage

 import (
@@ -19,8 +20,8 @@ import (

 	"github.com/GuiaBolso/darwin"
 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/server/websockets"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/jhillyerd/enmime"
 	"github.com/klauspost/compress/zstd"
 	"github.com/leporo/sqlf"
@@ -229,8 +230,7 @@ func Store(body []byte) (string, error) {
 		return "", err
 	}

-	// return summary
-	c := &Summary{}
+	c := &MessageSummary{}
 	if err := json.Unmarshal(b, c); err != nil {
 		return "", err
 	}
@@ -246,8 +246,8 @@ func Store(body []byte) (string, error) {

 // List returns a subset of messages from the mailbox,
 // sorted latest to oldest
-func List(start, limit int) ([]Summary, error) {
-	results := []Summary{}
+func List(start, limit int) ([]MessageSummary, error) {
+	results := []MessageSummary{}

 	q := sqlf.From("mailbox").
 		Select(`ID, Data, Read`).
@@ -259,7 +259,7 @@ func List(start, limit int) ([]Summary, error) {
 		var id string
 		var summary string
 		var read int
-		em := Summary{}
+		em := MessageSummary{}

 		if err := row.Scan(&id, &summary, &read); err != nil {
 			logger.Log().Error(err)
@@ -290,9 +290,9 @@ func List(start, limit int) ([]Summary, error) {
 // The search is broken up by segments (exact phrases can be quoted), and interprits specific terms such as:
 // is:read, is:unread, has:attachment, to:<term>, from:<term> & subject:<term>
 // Negative searches also also included by prefixing the search term with a `-` or `!`
-func Search(search string) ([]Summary, error) {
-	results := []Summary{}
-	start := time.Now()
+func Search(search string, start, limit int) ([]MessageSummary, error) {
+	results := []MessageSummary{}
+	tsStart := time.Now()

 	s := strings.ToLower(search)
 	// add another quote if missing closing quote
@@ -308,14 +308,14 @@ func Search(search string) ([]Summary, error) {
 	}

 	// generate the SQL based on arguments
-	q := searchParser(args)
+	q := searchParser(args, start, limit)

 	if err := q.QueryAndClose(nil, db, func(row *sql.Rows) {
 		var id string
 		var summary string
 		var read int
 		var ignore string
-		em := Summary{}
+		em := MessageSummary{}

 		if err := row.Scan(&id, &summary, &read, &ignore, &ignore, &ignore, &ignore); err != nil {
 			logger.Log().Error(err)
@@ -336,7 +336,7 @@ func Search(search string) ([]Summary, error) {
 		return results, err
 	}

-	elapsed := time.Since(start)
+	elapsed := time.Since(tsStart)

 	logger.Log().Debugf("[db] search for \"%s\" in %s", search, elapsed)

@@ -642,19 +642,18 @@ func DeleteAllMessages() error {
 	dbLastAction = time.Now()
 	dbDataDeleted = false

+	websockets.Broadcast("prune", nil)
+
 	return err
 }

 // StatsGet returns the total/unread statistics for a mailbox
 func StatsGet() MailboxStats {
 	var (
-		start  = time.Now()
 		total  = CountTotal()
 		unread = CountUnread()
 	)

-	logger.Log().Debugf("[db] statistics calculated in %s", time.Since(start))
-
 	dbLastAction = time.Now()

 	return MailboxStats{
--- a/storage/database_test.go
+++ b/storage/database_test.go
@@ -180,7 +180,7 @@ func TestSearch(t *testing.T) {
 			search = fmt.Sprintf("\"the email body %d jdsauk dwqmdqw\"", i)
 		}

-		summaries, err := Search(search)
+		summaries, err := Search(search, 0, 100)
 		if err != nil {
 			t.Log("error ", err)
 			t.Fail()
@@ -196,7 +196,7 @@ func TestSearch(t *testing.T) {
 	}

 	// search something that will return 200 rsults
-	summaries, err := Search("This is the email body")
+	summaries, err := Search("This is the email body", 0, testRuns)
 	if err != nil {
 		t.Log("error ", err)
 		t.Fail()
--- a/storage/search.go
+++ b/storage/search.go
@@ -8,7 +8,11 @@ import (
 )

 // SearchParser returns the SQL syntax for the database search based on the search arguments
-func searchParser(args []string) *sqlf.Stmt {
+func searchParser(args []string, start, limit int) *sqlf.Stmt {
+	if limit == 0 {
+		limit = 50
+	}
+
 	q := sqlf.From("mailbox").
 		Select(`ID, Data, read, 
 			json_extract(Data, '$.To') as ToJSON, 
@@ -17,7 +21,12 @@ func searchParser(args []string) *sqlf.Stmt {
 			json_extract(Data, '$.Attachments') as Attachments
 		`).
 		OrderBy("Sort DESC").
-		Limit(200)
+		Limit(limit).
+		Offset(start)
+
+	if limit > 0 {
+		q = q.Limit(limit)
+	}

 	for _, w := range args {
 		if cleanString(w) == "" {
--- a/storage/structs.go
+++ b/storage/structs.go
@@ -33,8 +33,8 @@ type Attachment struct {
 	Size        int
 }

-// Summary struct for frontend messages
-type Summary struct {
+// MessageSummary struct for frontend messages
+type MessageSummary struct {
 	ID          string
 	Read        bool
 	From        *mail.Address
--- a/storage/utils.go
+++ b/storage/utils.go
@@ -10,8 +10,8 @@ import (
 	"time"

 	"github.com/axllent/mailpit/config"
-	"github.com/axllent/mailpit/logger"
 	"github.com/axllent/mailpit/server/websockets"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/jhillyerd/enmime"
 	"github.com/k3a/html2text"
 	"github.com/leporo/sqlf"
--- a/utils/logger/logger.go
+++ b/utils/logger/logger.go
--- a/utils/updater/targz.go
+++ b/utils/updater/targz.go
--- a/utils/updater/unzip.go
+++ b/utils/updater/unzip.go
--- a/utils/updater/updater.go
+++ b/utils/updater/updater.go
@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"runtime"

-	"github.com/axllent/mailpit/logger"
+	"github.com/axllent/mailpit/utils/logger"
 	"github.com/axllent/semver"
 )
Author	SHA1	Message	Date
Ralph Slooten	fc0a7358ab	Merge branch 'release/v1.2.7'	2022-10-31 22:15:25 +13:00
Ralph Slooten	d229b34d98	Release v1.2.7	2022-10-31 22:15:24 +13:00
Ralph Slooten	cbc3fe59a8	Feature: Allow custom webroot Allow Mailpit to run on a custom webroot, resolves #19	2022-10-31 22:13:41 +13:00
Ralph Slooten	ab771cf76c	Move utils to subfolder	2022-10-29 10:52:22 +13:00
Ralph Slooten	7a27e09d23	Merge tag 'v1.2.6' into develop Release v1.2.6	2022-10-29 10:23:32 +13:00
Ralph Slooten	cdce989a9c	Merge branch 'release/v1.2.6'	2022-10-29 10:23:30 +13:00
Ralph Slooten	61dd3eddc5	Release v1.2.6	2022-10-29 10:23:29 +13:00
Ralph Slooten	290e48d875	Libs: Update go modules	2022-10-29 10:22:12 +13:00
Ralph Slooten	e7ea94a5d2	Libs: Update node modules	2022-10-29 10:22:05 +13:00
Ralph Slooten	43bd2a18ea	API: Provide structs of API v1 responses for use in client code See #21	2022-10-21 22:55:15 +13:00
Ralph Slooten	ec95e58e13	Use ${{ github.ref_name }} for workflow build tags	2022-10-16 12:12:28 +13:00
Ralph Slooten	70ac9c73ea	Release 1.2.5	2022-10-16 12:07:20 +13:00
Ralph Slooten	0fcdcdd5f6	Merge tag '1.2.5' into develop Release 1.2.5	2022-10-16 12:04:51 +13:00
Ralph Slooten	ea12a1ee56	Merge branch 'release/1.2.5'	2022-10-16 12:04:30 +13:00
Ralph Slooten	9345ed60c6	Update screenshot	2022-10-16 12:01:40 +13:00
Ralph Slooten	0a13cf8304	Tidy JS code	2022-10-16 11:51:20 +13:00
Ralph Slooten	4ebbdab7c0	Snapshot memory usage first	2022-10-16 11:36:28 +13:00
Ralph Slooten	cea9518b4b	UI mobile tweaks	2022-10-16 10:45:04 +13:00
Ralph Slooten	a9220277d6	Refresh first page after prune when !results	2022-10-16 10:21:57 +13:00
Ralph Slooten	bd45d9dffe	UI: Broadcast "delete all" action to reload all connected clients	2022-10-16 08:37:46 +13:00
Ralph Slooten	baaf3a3a23	UI tweaks	2022-10-16 00:03:16 +13:00
Ralph Slooten	2e95a75d32	Update Vue	2022-10-15 23:46:53 +13:00
Ralph Slooten	53d2296ff5	Minor UI changes	2022-10-15 23:37:22 +13:00
Ralph Slooten	e8bf803ca0	UI: Load first page if paginated list returns 0 results	2022-10-15 23:30:09 +13:00
Ralph Slooten	d9dc000e89	UI: Theme changes	2022-10-15 23:14:51 +13:00
Ralph Slooten	205611856b	UI: Bump build action to use node 18	2022-10-15 09:41:33 +13:00
Ralph Slooten	5d396b9f25	Update build workflow	2022-10-15 09:31:29 +13:00
Ralph Slooten	4b95c6bda0	Merge tag '1.2.4' into develop Release 1.2.4	2022-10-15 09:02:19 +13:00
Ralph Slooten	9982948c81	Merge branch 'release/1.2.4'	2022-10-15 09:02:17 +13:00
Ralph Slooten	614b63cf28	Release 1.2.4	2022-10-15 09:02:16 +13:00
Martin	b1027ca844	Bugfix: Fix mail download link	2022-10-15 08:54:36 +13:00
Ralph Slooten	2176ad6ca2	Update API query parameters for search	2022-10-14 17:38:22 +13:00
Ralph Slooten	971753e576	Merge tag '1.2.3' into develop Release 1.2.3	2022-10-14 17:32:01 +13:00
Ralph Slooten	9053651cc1	Merge branch 'release/1.2.3'	2022-10-14 17:31:56 +13:00
Ralph Slooten	a9593030ab	Release 1.2.3	2022-10-14 17:31:56 +13:00
Ralph Slooten	75a7c1cfd4	Update API query parameters for search	2022-10-14 17:31:35 +13:00
Ralph Slooten	699a534632	API: Add limit and start parameters to search Requested in #15	2022-10-14 17:31:35 +13:00
Ralph Slooten	53f8d34961	UI: Prevent double message index request on websocket connect	2022-10-14 17:30:48 +13:00
Ralph Slooten	81d09aabd1	Add linux/386 docker builds	2022-10-14 17:29:33 +13:00
Ralph Slooten	11eec7db30	Add linux-arm to release matrix	2022-10-14 17:29:33 +13:00