From ce695648c08e1d1be6a9f4c102e3143f1d02c059 Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.h@sprinternet.at>
Date: Fri, 20 Feb 2026 19:09:37 +0100
Subject: [PATCH] fix: improve peer email handling logic (#620)

---
 internal/app/mail/manager.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/internal/app/mail/manager.go b/internal/app/mail/manager.go
index 5a20278..5a2e543 100644
--- a/internal/app/mail/manager.go
+++ b/internal/app/mail/manager.go
@@ -190,19 +190,21 @@ func (m Manager) resolveEmail(ctx context.Context, peer *domain.Peer) (string, d
 			if err == nil {
 				slog.Debug("peer email: using user-identifier as email",
 					"peer", peer.Identifier, "email", peer.UserIdentifier)
-				return string(peer.UserIdentifier), domain.User{}
-			} else {
-				slog.Debug("peer email: skipping peer email",
-					"peer", peer.Identifier,
-					"reason", "peer has no user linked and user-identifier is not a valid email address")
-				return "", domain.User{}
+				return string(peer.UserIdentifier), domain.User{
+					Email: string(peer.UserIdentifier),
+				}
 			}
-		} else {
+
 			slog.Debug("peer email: skipping peer email",
 				"peer", peer.Identifier,
-				"reason", "user has no user linked")
+				"reason", "peer has no user linked and user-identifier is not a valid email address")
 			return "", domain.User{}
 		}
+
+		slog.Debug("peer email: skipping peer email",
+			"peer", peer.Identifier,
+			"reason", "user has no user linked")
+		return "", domain.User{}
 	}
 
 	if user.Email == "" {