diff --git a/plugins/base/public/message.html b/plugins/base/public/message.html
index b41ae39..89fd4dd 100644
--- a/plugins/base/public/message.html
+++ b/plugins/base/public/message.html
@@ -50,7 +50,7 @@
 {{end}}
 
 {{define "addr-list"}}
-	{{range $i := .}}
+	{{range $i, $addr := .}}
 		{{if $i}},{{end}}
 		{{.PersonalName}}
 		&lt;<a href="/compose?to={{.Address}}">{{.Address}}</a>&gt;