diff --git a/swaks-tests/favicon.png b/swaks-tests/favicon.png
new file mode 100644
index 0000000..92f1f50
Binary files /dev/null and b/swaks-tests/favicon.png differ
diff --git a/swaks-tests/html.raw b/swaks-tests/html.raw
new file mode 100644
index 0000000..e42a7a3
--- /dev/null
+++ b/swaks-tests/html.raw
@@ -0,0 +1,25 @@
+Date: %DATE%
+To: %TO_ADDRESS%
+From: %FROM_ADDRESS%
+Subject: Swaks HTML
+MIME-Version: 1.0
+Content-Type: multipart/alternative; boundary="----=_MIME_BOUNDARY_000_62717"
+
+------=_MIME_BOUNDARY_000_62717
+Content-Type: text/plain
+
+This is a test mailing.
+
+This should be clickable: http://google.com/
+
+------=_MIME_BOUNDARY_000_62717
+Content-Type: text/html
+Content-Transfer-Encoding: BASE64
+
+PGh0bWw+Cjxib2R5Pgo8cD5UaGlzIGlzIGEgdGVzdCBtYWlsaW5nIDxiPmluIEhUTUw8L2I+PC9w
+PgoKPHA+VGhpcyBzaG91bGQgYmUgY2xpY2thYmxlOiA8YSBocmVmPSJodHRwOi8vZ29vZ2xlLmNv
+bS8iPmdvb2dsZS5jb208L2E+PC9wPgo8L2JvZHk+CjwvaHRtbD4K
+
+------=_MIME_BOUNDARY_000_62717--
+
+
diff --git a/swaks-tests/run-tests.sh b/swaks-tests/run-tests.sh
new file mode 100755
index 0000000..be1246e
--- /dev/null
+++ b/swaks-tests/run-tests.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+export SWAKS_OPT_server="127.0.0.1:2500"
+export SWAKS_OPT_to="swaks@inbucket.local"
+
+# Basic test
+swaks --h-Subject: "Swaks Plain Text" --body text.txt
+
+# HTML test
+swaks --h-Subject: "Swaks HTML" --data html.raw
+
+# Attachment test
+swaks --h-Subject: "Swaks Attachment" --attach-type image/png --attach favicon.png
diff --git a/swaks-tests/text.txt b/swaks-tests/text.txt
new file mode 100644
index 0000000..90e8390
--- /dev/null
+++ b/swaks-tests/text.txt
@@ -0,0 +1,3 @@
+This is a test mailing.
+
+This should be clickable: http://google.com/
diff --git a/web/mailbox_controller.go b/web/mailbox_controller.go
index 3ff9dd4..33176fa 100644
--- a/web/mailbox_controller.go
+++ b/web/mailbox_controller.go
@@ -63,15 +63,15 @@ func MailboxShow(w http.ResponseWriter, req *http.Request, ctx *Context) (err er
 
 	mb, err := ctx.DataStore.MailboxFor(name)
 	if err != nil {
-		return err
+		return fmt.Errorf("MailboxFor('%v'): %v", name, err)
 	}
 	message, err := mb.GetMessage(id)
 	if err != nil {
-		return err
+		return fmt.Errorf("GetMessage() failed: %v", err)
 	}
 	_, mime, err := message.ReadBody()
 	if err != nil {
-		return err
+		return fmt.Errorf("ReadBody() failed: %v", err)
 	}
 	body := template.HTML(textToHtml(mime.Text))
 	htmlAvailable := mime.Html != ""