diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index 9d80c74..a4fec09 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -205,7 +205,7 @@ type HeaderView struct {
 }
 
 func (hv *HeaderView) Draw(ctx *ui.Context) {
-	size := runewidth.StringWidth(" " + hv.Name + " ")
+	size := runewidth.StringWidth(hv.Name)
 	var style tcell.Style
 	if hv.Name == "PGP" {
 		style = tcell.StyleDefault.Foreground(tcell.ColorGreen)
@@ -213,7 +213,8 @@ func (hv *HeaderView) Draw(ctx *ui.Context) {
 		style = tcell.StyleDefault
 	}
 	ctx.Fill(0, 0, ctx.Width(), ctx.Height(), ' ', style)
-	ctx.Printf(0, 0, tcell.StyleDefault.Reverse(true), " "+hv.Name+" ")
+	ctx.Printf(0, 0,
+		tcell.StyleDefault.Bold(true), hv.Name)
 	ctx.Printf(size, 0, style, " "+hv.Value)
 }