diff --git a/pkg/message/manager.go b/pkg/message/manager.go
index 6370ea6..cd32ba0 100644
--- a/pkg/message/manager.go
+++ b/pkg/message/manager.go
@@ -85,7 +85,7 @@ func (s *StoreManager) Deliver(
 		broadcast := msghub.Message{
 			Mailbox: to.Mailbox,
 			ID:      id,
-			From:    delivery.From().String(),
+			From:    stringutil.StringAddress(delivery.From()),
 			To:      stringutil.StringAddressList(delivery.To()),
 			Subject: delivery.Subject(),
 			Date:    delivery.Date(),
diff --git a/pkg/webui/mailbox_controller.go b/pkg/webui/mailbox_controller.go
index d1fc80c..b1a6033 100644
--- a/pkg/webui/mailbox_controller.go
+++ b/pkg/webui/mailbox_controller.go
@@ -64,7 +64,7 @@ func MailboxMessage(w http.ResponseWriter, req *http.Request, ctx *web.Context)
 		&jsonMessage{
 			Mailbox:     name,
 			ID:          msg.ID,
-			From:        msg.From.String(),
+			From:        stringutil.StringAddress(msg.From),
 			To:          stringutil.StringAddressList(msg.To),
 			Subject:     msg.Subject,
 			Date:        msg.Date,