diff --git a/plugins/base/public/mailbox.html b/plugins/base/public/mailbox.html
index ff2e3a9..51a78d8 100644
--- a/plugins/base/public/mailbox.html
+++ b/plugins/base/public/mailbox.html
@@ -27,7 +27,7 @@
   <ul>
     {{range .Messages}}
       <li>
-        <a href="{{.TextPart.URL false}}">
+        <a href="{{if .TextPart}}{{.TextPart.URL false}}{{else}}{{.URL}}{{end}}">
           {{if .Envelope.Subject}}
             {{.Envelope.Subject}}
           {{else}}