diff --git a/internal/htmlcheck/css.go b/internal/htmlcheck/css.go
index 53a404e..84a5708 100644
--- a/internal/htmlcheck/css.go
+++ b/internal/htmlcheck/css.go
@@ -25,14 +25,12 @@ func runCSSTests(html string) ([]Warning, int, error) {
 
 	inlined, err := inlineRemoteCSS(html)
 	if err != nil {
-		// logger.Log().Warn(err)
 		inlined = html
 	}
 
 	// merge all CSS inline
 	merged, err := mergeInlineCSS(inlined)
 	if err != nil {
-		// logger.Log().Warn(err)
 		merged = inlined
 	}
 
@@ -157,7 +155,7 @@ func inlineRemoteCSS(h string) (string, error) {
 
 				resp, err := downloadToBytes(a.Val)
 				if err != nil {
-					logger.Log().Warningf("html check failed to download %s", a.Val)
+					logger.Log().Warnf("[html-check] failed to download %s", a.Val)
 					continue
 				}
 
@@ -179,7 +177,7 @@ func inlineRemoteCSS(h string) (string, error) {
 
 	newDoc, err := doc.Html()
 	if err != nil {
-		logger.Log().Warning(err)
+		logger.Log().Warnf("[html-check] failed to download %s", err.Error())
 		return h, err
 	}
 
diff --git a/internal/linkcheck/status.go b/internal/linkcheck/status.go
index cc3f004..102f619 100644
--- a/internal/linkcheck/status.go
+++ b/internal/linkcheck/status.go
@@ -79,7 +79,7 @@ func doHead(link string, followRedirects bool) (int, error) {
 
 	req, err := http.NewRequest("HEAD", link, nil)
 	if err != nil {
-		logger.Log().Error(err)
+		logger.Log().Errorf("[link-check] %s", err.Error())
 		return 0, err
 	}
 
diff --git a/internal/storage/database.go b/internal/storage/database.go
index b2d1b76..a9fc539 100644
--- a/internal/storage/database.go
+++ b/internal/storage/database.go
@@ -110,7 +110,7 @@ func InitDB() error {
 func Close() {
 	if db != nil {
 		if err := db.Close(); err != nil {
-			logger.Log().Warning("[db] error closing database, ignoring")
+			logger.Log().Warn("[db] error closing database, ignoring")
 		}
 	}
 
@@ -128,7 +128,7 @@ func Store(body *[]byte) (string, error) {
 	// Parse message body with enmime
 	env, err := enmime.ReadEnvelope(bytes.NewReader(*body))
 	if err != nil {
-		logger.Log().Warningf("[db] %s", err.Error())
+		logger.Log().Warnf("[message] %s", err.Error())
 		return "", nil
 	}
 
@@ -271,12 +271,12 @@ func List(start, limit int) ([]MessageSummary, error) {
 		em := MessageSummary{}
 
 		if err := row.Scan(&created, &id, &messageID, &subject, &metadata, &size, &attachments, &read, &snippet); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			return
 		}
 
 		if err := json.Unmarshal([]byte(metadata), &em); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[json] %s", err.Error())
 			return
 		}
 
@@ -349,7 +349,7 @@ func GetMessage(id string) (*Message, error) {
 			var created int64
 
 			if err := row.Scan(&created); err != nil {
-				logger.Log().Error(err)
+				logger.Log().Errorf("[db] %s", err.Error())
 				return
 			}
 
@@ -357,7 +357,7 @@ func GetMessage(id string) (*Message, error) {
 
 			date = time.UnixMilli(created)
 		}); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 		}
 	}
 
diff --git a/internal/storage/migrationTasks.go b/internal/storage/migrationTasks.go
index 94ebff3..756a762 100644
--- a/internal/storage/migrationTasks.go
+++ b/internal/storage/migrationTasks.go
@@ -36,7 +36,7 @@ func migrateTagsToManyMany() {
 		tags := []string{}
 
 		if err := json.Unmarshal([]byte(jsonTags), &tags); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[json] %s", err.Error())
 			return
 		}
 
diff --git a/internal/storage/reindex.go b/internal/storage/reindex.go
index bc5c3c6..282f857 100644
--- a/internal/storage/reindex.go
+++ b/internal/storage/reindex.go
@@ -29,7 +29,7 @@ func ReindexAll() {
 		})
 
 	if err != nil {
-		logger.Log().Error(err)
+		logger.Log().Errorf("[db] %s", err.Error())
 		os.Exit(1)
 	}
 
@@ -59,7 +59,7 @@ func ReindexAll() {
 
 			env, err := enmime.ReadEnvelope(r)
 			if err != nil {
-				logger.Log().Error(err)
+				logger.Log().Errorf("[message] %s", err.Error())
 				continue
 			}
 
@@ -77,7 +77,7 @@ func ReindexAll() {
 		ctx := context.Background()
 		tx, err := db.BeginTx(ctx, nil)
 		if err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			continue
 		}
 
@@ -88,13 +88,13 @@ func ReindexAll() {
 		for _, u := range updates {
 			_, err = tx.Exec("UPDATE mailbox SET SearchText = ?, Snippet = ? WHERE ID = ?", u.SearchText, u.Snippet, u.ID)
 			if err != nil {
-				logger.Log().Error(err)
+				logger.Log().Errorf("[db] %s", err.Error())
 				continue
 			}
 		}
 
 		if err := tx.Commit(); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			continue
 		}
 
diff --git a/internal/storage/search.go b/internal/storage/search.go
index 8750d78..0617275 100644
--- a/internal/storage/search.go
+++ b/internal/storage/search.go
@@ -43,12 +43,12 @@ func Search(search string, start, limit int) ([]MessageSummary, int, error) {
 		em := MessageSummary{}
 
 		if err := row.Scan(&created, &id, &messageID, &subject, &metadata, &size, &attachments, &read, &snippet, &ignore, &ignore, &ignore, &ignore); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			return
 		}
 
 		if err := json.Unmarshal([]byte(metadata), &em); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			return
 		}
 
@@ -114,7 +114,7 @@ func DeleteSearch(search string) error {
 		var ignore string
 
 		if err := row.Scan(&created, &id, &messageID, &subject, &metadata, &size, &attachments, &read, &snippet, &ignore, &ignore, &ignore, &ignore); err != nil {
-			logger.Log().Error(err)
+			logger.Log().Errorf("[db] %s", err.Error())
 			return
 		}
 
diff --git a/internal/storage/tags.go b/internal/storage/tags.go
index 8d3ef6b..7bcffe8 100644
--- a/internal/storage/tags.go
+++ b/internal/storage/tags.go
@@ -149,7 +149,7 @@ func GetAllTags() []string {
 		QueryAndClose(nil, db, func(row *sql.Rows) {
 			tags = append(tags, name)
 		}); err != nil {
-		logger.Log().Error(err)
+		logger.Log().Errorf("[db] %s", err.Error())
 	}
 
 	return tags
@@ -172,7 +172,7 @@ func GetAllTagsCount() map[string]int64 {
 			tags[name] = total
 			// tags = append(tags, name)
 		}); err != nil {
-		logger.Log().Error(err)
+		logger.Log().Errorf("[db] %s", err.Error())
 	}
 
 	return tags
@@ -193,7 +193,7 @@ func pruneUnusedTags() error {
 		var c int
 
 		if err := row.Scan(&id, &n, &c); err != nil {
-			logger.Log().Error("[tags]", err)
+			logger.Log().Errorf("[tags] %s", err.Error())
 			return
 		}
 
diff --git a/server/apiv1/thumbnails.go b/server/apiv1/thumbnails.go
index 8eb8728..8a1291e 100644
--- a/server/apiv1/thumbnails.go
+++ b/server/apiv1/thumbnails.go
@@ -77,7 +77,7 @@ func Thumbnail(w http.ResponseWriter, r *http.Request) {
 	img, err := imaging.Decode(buf)
 	if err != nil {
 		// it's not an image, return default
-		logger.Log().Warning(err)
+		logger.Log().Warnf("[image] %s", err.Error())
 		blankImage(a, w)
 		return
 	}
@@ -99,7 +99,7 @@ func Thumbnail(w http.ResponseWriter, r *http.Request) {
 	dst = imaging.OverlayCenter(dst, dstImageFill, 1.0)
 
 	if err := jpeg.Encode(foo, dst, &jpeg.Options{Quality: 70}); err != nil {
-		logger.Log().Warning(err)
+		logger.Log().Warnf("[image] %s", err.Error())
 		blankImage(a, w)
 		return
 	}
@@ -120,7 +120,7 @@ func blankImage(a *enmime.Part, w http.ResponseWriter) {
 	dstImageFill := imaging.Fill(img, thumbWidth, thumbHeight, imaging.Center, imaging.Lanczos)
 
 	if err := jpeg.Encode(foo, dstImageFill, &jpeg.Options{Quality: 70}); err != nil {
-		logger.Log().Warning(err)
+		logger.Log().Warnf("[image] %s", err.Error())
 	}
 
 	fileName := a.FileName
diff --git a/server/handlers/proxy.go b/server/handlers/proxy.go
index 010c4c4..0dd360b 100644
--- a/server/handlers/proxy.go
+++ b/server/handlers/proxy.go
@@ -95,7 +95,7 @@ func ProxyHandler(w http.ResponseWriter, r *http.Request) {
 
 			address, err := absoluteURL(parts[3], uri)
 			if err != nil {
-				logger.Log().Error(err)
+				logger.Log().Errorf("[proxy] %s", err.Error())
 				return []byte(parts[3])
 			}
 
diff --git a/server/websockets/client.go b/server/websockets/client.go
index 547ea0e..c4523c0 100644
--- a/server/websockets/client.go
+++ b/server/websockets/client.go
@@ -132,7 +132,7 @@ func ServeWs(hub *Hub, w http.ResponseWriter, r *http.Request) {
 
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		logger.Log().Error(err)
+		logger.Log().Errorf("[websocket] %s", err.Error())
 		return
 	}