diff --git a/plugins/base/public/compose.html b/plugins/base/public/compose.html
index 2a52675..5f0b904 100644
--- a/plugins/base/public/compose.html
+++ b/plugins/base/public/compose.html
@@ -11,14 +11,17 @@
 <form method="post" action="">
 	<input type="hidden" name="in_reply_to" value="{{.Message.InReplyTo}}">
 
-	<p>From:</p>
-	<input type="email" name="from" value="{{.Message.From}}">
-	<p>To:</p>
-	<input type="email" name="to" multiple value="{{.Message.ToString}}">
-	<p>Subject:</p>
-	<input type="text" name="subject" value="{{.Message.Subject}}">
-	<p>Body:</p>
-	<textarea name="text" cols="80" rows="20">{{.Message.Text}}</textarea>
+	<label for="from">From:</label>
+	<input type="email" name="from" id="from" value="{{.Message.From}}">
+	<br><br>
+	<label for="to">To:</label>
+	<input type="email" name="to" id="to" multiple value="{{.Message.ToString}}">
+	<br><br>
+	<label for="subject">Subject:</label>
+	<input type="text" name="subject" id="subject" value="{{.Message.Subject}}">
+	<br><br>
+	<label for="text">Body:</label><br>
+	<textarea name="text" id="text" cols="80" rows="20">{{.Message.Text}}</textarea>
 	<br><br>
 	<input type="submit" value="Send">
 </form>
diff --git a/plugins/base/public/mailbox.html b/plugins/base/public/mailbox.html
index 53cf697..6deaa38 100644
--- a/plugins/base/public/mailbox.html
+++ b/plugins/base/public/mailbox.html
@@ -44,7 +44,7 @@
 		{{end}}
 	</p>
 {{else}}
-	<p>Mailbox is empty.</p>
+	<p>No message.</p>
 {{end}}
 
 {{template "foot.html"}}