diff --git a/APIv1.md b/APIv1.md
new file mode 100644
index 0000000..7366cbd
--- /dev/null
+++ b/APIv1.md
@@ -0,0 +1,48 @@
+Go-MailHog API v1
+=================
+
+The v1 API is a RESTful HTTP JSON API.
+
+### GET /v1/api/messages
+
+Lists all messages excluding message content
+
+### DELETE /v1/api/messages
+
+Deletes all messages
+
+Returns a ```200``` response code if message deletion was successful.
+
+### GET /v1/api/messages/{ message_id }
+
+Returns an individual message including message content
+
+### DELETE /v1/api/messages/{ message_id }
+
+Delete an individual message
+
+Returns a ```200``` response code if message deletion was successful.
+
+### GET /v1/api/messages/{ message_id }/download
+
+Download the complete message
+
+### GET /v1/api/messages/{ message_id }/mime/part/{ part_index }/download
+
+Download a MIME part
+
+### POST /v1/api/messages/{ message_id }/release
+
+Release the message to an SMTP server
+
+Send a JSON body specifying the recipient, SMTP hostname and port number:
+
+```json
+{
+	"Host": "mail.example.com",
+	"Post": "25",
+	"Email": "someone@example.com"
+}
+```
+
+Returns a ```200``` response code if message delivery was successful.
diff --git a/README.md b/README.md
index 0daeaa0..af8921c 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ server will start on port 8025.
 * Web interface to view messages (plain text, HTML or source)
 * Release messages to real SMTP servers
 * HTTP API to list, retrieve and delete messages
+  * See (APIv1 documentation)[APIv1.md] for more information
 * Multipart MIME support
 * Download individual MIME parts
 * In-memory message storage
diff --git a/assets/js/controllers.js b/assets/js/controllers.js
index 548a6bc..81a05b5 100644
--- a/assets/js/controllers.js
+++ b/assets/js/controllers.js
@@ -208,7 +208,7 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) {
   $scope.deleteAllConfirm = function() {
   	$('#confirm-delete-all').modal('hide');
     var e = $scope.startEvent("Deleting all messages", null, "glyphicon-remove-circle");
-  	$http.post('/api/v1/messages/delete').success(function() {
+  	$http.delete('/api/v1/messages').success(function() {
   		$scope.refresh();
   		$scope.preview = null;
       e.done()
@@ -217,7 +217,7 @@ mailhogApp.controller('MailCtrl', function ($scope, $http, $sce, $timeout) {
 
   $scope.deleteOne = function(message) {
     var e = $scope.startEvent("Deleting message", message.Id, "glyphicon-remove");
-  	$http.post('/api/v1/messages/' + message.Id + '/delete').success(function() {
+  	$http.delete('/api/v1/messages/' + message.Id).success(function() {
   		if($scope.preview._id == message._id) $scope.preview = null;
   		$scope.refresh();
       e.done();
diff --git a/bindata.go b/bindata.go
index d0c59e7..e5c80e5 100644
--- a/bindata.go
+++ b/bindata.go
@@ -452,140 +452,140 @@ func assets_js_controllers_js() ([]byte, error) {
 		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xec, 0x58,
 		0x5b, 0x6b, 0x1b, 0xc9, 0x12, 0x7e, 0x96, 0x7e, 0x45, 0x9f, 0x39, 0x06,
 		0xcd, 0xc4, 0xd2, 0xc8, 0x86, 0xc3, 0x79, 0xb0, 0xc8, 0x39, 0x64, 0xed,
-		0x84, 0x18, 0x62, 0x36, 0x24, 0x79, 0x58, 0x70, 0xcc, 0xd2, 0x9e, 0x29,
-		0x69, 0x86, 0xf4, 0x5c, 0xe8, 0x6e, 0x49, 0x31, 0x41, 0xff, 0x7d, 0xab,
-		0xa7, 0x6f, 0x73, 0x93, 0x6c, 0xb2, 0xec, 0xc3, 0xc2, 0x9a, 0x90, 0xd1,
-		0x74, 0x55, 0x57, 0x55, 0x7f, 0x75, 0xed, 0xd9, 0x51, 0x4e, 0x0a, 0x9a,
-		0xb3, 0xac, 0xda, 0xbc, 0xa9, 0x6b, 0xf2, 0x9a, 0xd0, 0x72, 0xb3, 0x65,
-		0x94, 0xc7, 0x45, 0x95, 0x6e, 0x19, 0x84, 0x33, 0x4f, 0x9c, 0xcd, 0xc9,
-		0xfd, 0x43, 0xb4, 0x9a, 0x4e, 0xd7, 0xdb, 0x32, 0x91, 0x79, 0x55, 0x92,
-		0xcd, 0x36, 0x4f, 0xc3, 0x88, 0xfc, 0x98, 0x12, 0xe2, 0xd6, 0xc4, 0x7f,
-		0xcc, 0x0a, 0x21, 0x1c, 0xe4, 0x96, 0x97, 0xe4, 0x8e, 0xca, 0x2c, 0x5e,
-		0xb3, 0xaa, 0xe2, 0x61, 0x78, 0x49, 0xce, 0xf5, 0x3b, 0xa7, 0x65, 0x5a,
-		0x15, 0x61, 0x14, 0x91, 0x57, 0xe4, 0xe2, 0xfb, 0xe5, 0x05, 0xfe, 0x45,
-		0xcd, 0xa6, 0xd6, 0x5f, 0x2c, 0xab, 0xcf, 0x92, 0xe7, 0xe5, 0x26, 0xbc,
-		0xfc, 0xef, 0x90, 0x28, 0xb6, 0x8f, 0xc2, 0x50, 0xd1, 0x28, 0x42, 0x0e,
-		0x53, 0xa7, 0xb1, 0xb1, 0xe1, 0xdc, 0x3e, 0x66, 0x8b, 0xd9, 0xa9, 0x17,
-		0x2f, 0x78, 0x8c, 0xa5, 0xf5, 0x58, 0x4d, 0x0f, 0xd3, 0xa9, 0x87, 0x23,
-		0x4e, 0xaa, 0x52, 0xf2, 0x8a, 0x31, 0xe0, 0xe1, 0xec, 0x0e, 0x97, 0xaf,
-		0x25, 0x67, 0x88, 0x91, 0x43, 0x22, 0x3c, 0x13, 0x49, 0x55, 0xc3, 0x9c,
-		0x9c, 0x65, 0x52, 0xd6, 0xf8, 0x10, 0x89, 0x7a, 0x91, 0x79, 0x01, 0xd5,
-		0x56, 0x6a, 0x90, 0x34, 0x4b, 0x9c, 0xd0, 0x24, 0x03, 0x04, 0xff, 0xc7,
-		0x61, 0xe5, 0x17, 0x6b, 0x0e, 0xbb, 0x1c, 0xf6, 0x6f, 0x18, 0x7b, 0x0f,
-		0x34, 0x05, 0x2e, 0x90, 0x61, 0x4d, 0x99, 0x00, 0x74, 0x81, 0x63, 0x82,
-		0x1d, 0x94, 0x52, 0x7c, 0x84, 0x32, 0x45, 0x24, 0xfa, 0x12, 0x1a, 0xe2,
-		0x75, 0xb5, 0x2d, 0x25, 0x52, 0x2e, 0xfa, 0x84, 0x9b, 0xaa, 0x84, 0xb1,
-		0xf5, 0x77, 0x78, 0x16, 0x48, 0x35, 0xc5, 0x93, 0x84, 0xa4, 0x5c, 0xbe,
-		0x55, 0x74, 0x65, 0x86, 0x39, 0x63, 0x58, 0xd2, 0x02, 0xcf, 0x44, 0xf9,
-		0x46, 0xcc, 0xc9, 0x86, 0x3d, 0xd5, 0x59, 0x8e, 0xa8, 0x58, 0xff, 0xab,
-		0xd8, 0x82, 0xdb, 0x1b, 0xe4, 0xd7, 0x81, 0xb2, 0x6a, 0x56, 0x91, 0x41,
-		0x54, 0x0c, 0x62, 0x56, 0x6d, 0xc2, 0xe0, 0xb3, 0x92, 0xaa, 0x2c, 0x6f,
-		0x34, 0x93, 0x59, 0x80, 0x58, 0x2b, 0x99, 0xf8, 0x08, 0x66, 0x64, 0x9f,
-		0xcb, 0x8c, 0xe4, 0xa9, 0x5e, 0x56, 0x92, 0xd4, 0x6a, 0x10, 0x79, 0xe1,
-		0xea, 0xc0, 0xc6, 0x7f, 0x79, 0x7a, 0xa5, 0x58, 0xe6, 0xe6, 0x55, 0x09,
-		0xb9, 0x6a, 0xfe, 0xb7, 0x2b, 0xcd, 0x01, 0x00, 0xb9, 0x4a, 0xd8, 0x93,
-		0x1b, 0x2a, 0x21, 0x8c, 0x2c, 0x29, 0xa9, 0x8a, 0x9a, 0x81, 0xc4, 0x0d,
-		0x0d, 0xbe, 0x76, 0x79, 0xdd, 0x00, 0xd1, 0x5b, 0x54, 0x67, 0xbd, 0xd2,
-		0x27, 0x36, 0x2b, 0xee, 0xdc, 0x57, 0xfe, 0xa7, 0xa3, 0x81, 0xbc, 0x66,
-		0x54, 0xe0, 0x0e, 0x07, 0x59, 0xe4, 0x4c, 0x26, 0x64, 0xb9, 0x24, 0xef,
-		0x6e, 0x7f, 0xbb, 0x7b, 0x4b, 0x1e, 0x73, 0x89, 0xc6, 0x0a, 0xf9, 0xe4,
-		0x48, 0xf9, 0x3a, 0x94, 0x59, 0x2e, 0x62, 0x6d, 0x44, 0x7b, 0x93, 0x0b,
-		0xf3, 0xe0, 0x71, 0xb3, 0x48, 0x31, 0x5f, 0x81, 0x07, 0x8e, 0x78, 0x18,
-		0x08, 0xb0, 0x87, 0x3b, 0x2a, 0x42, 0x6c, 0x93, 0x04, 0x84, 0x18, 0x93,
-		0xd1, 0xe2, 0xda, 0x53, 0x5e, 0xa2, 0xa3, 0x82, 0x95, 0x32, 0xba, 0xd6,
-		0xf1, 0x66, 0xf8, 0x0e, 0xf6, 0xb4, 0x29, 0x46, 0xd4, 0xd1, 0x93, 0xa6,
-		0xa0, 0xac, 0x18, 0x8d, 0xdb, 0x7b, 0x74, 0xdc, 0x83, 0x63, 0xb5, 0x9e,
-		0x55, 0xd6, 0xaf, 0xdc, 0x2a, 0xb8, 0x83, 0x28, 0x12, 0xdf, 0x82, 0x27,
-		0xf5, 0x83, 0xfa, 0xfc, 0x7c, 0xf5, 0x22, 0x18, 0x3b, 0x91, 0x68, 0xa2,
-		0xbe, 0x15, 0x87, 0x10, 0xbf, 0x2c, 0x12, 0x1b, 0x08, 0x08, 0x60, 0x8c,
-		0x1c, 0x97, 0x7e, 0x6d, 0x6c, 0xff, 0x69, 0x05, 0xc4, 0x15, 0x8e, 0x70,
-		0x14, 0x5f, 0x0d, 0x11, 0x87, 0xa2, 0xda, 0x81, 0xcd, 0x34, 0xeb, 0x1d,
-		0xa2, 0xcb, 0xeb, 0x6a, 0xe0, 0xe0, 0x43, 0x3b, 0xd2, 0x8f, 0x38, 0x6e,
-		0x58, 0x19, 0xda, 0xf0, 0xb6, 0xb0, 0x1d, 0xb8, 0xa5, 0xa1, 0xa9, 0x90,
-		0xf0, 0xf6, 0x38, 0x85, 0xda, 0xd0, 0x23, 0x2a, 0x3b, 0xc8, 0xdd, 0xc0,
-		0x9f, 0xc2, 0x0d, 0xfd, 0x0f, 0xa3, 0xce, 0x1f, 0x9e, 0x6b, 0xb1, 0x18,
-		0x22, 0x84, 0x31, 0xfd, 0x4c, 0xd8, 0x1e, 0x0f, 0xc3, 0xb6, 0xbc, 0x41,
-		0x41, 0x6e, 0x13, 0x4d, 0x96, 0x99, 0xda, 0xde, 0x36, 0xe0, 0xa0, 0x5f,
-		0x8f, 0x2a, 0x47, 0xcc, 0x61, 0xc8, 0xd2, 0x28, 0xb0, 0x5e, 0x32, 0xc2,
-		0x41, 0xb7, 0x48, 0x5f, 0xcf, 0x0b, 0x4c, 0x79, 0xba, 0x01, 0x71, 0x93,
-		0x8b, 0x9a, 0xd1, 0xa7, 0xc6, 0x7f, 0x03, 0x6f, 0x98, 0xcd, 0x67, 0xe1,
-		0xec, 0xdf, 0x96, 0x7f, 0xa1, 0xda, 0x1e, 0xcd, 0x4b, 0xe0, 0x44, 0xd2,
-		0x47, 0x06, 0x44, 0x3e, 0x56, 0xe9, 0x13, 0xba, 0x7e, 0x16, 0xc5, 0x0c,
-		0xca, 0x8d, 0xcc, 0x7a, 0x8a, 0x38, 0xac, 0x39, 0x88, 0x6c, 0x4c, 0xbc,
-		0xcd, 0xf4, 0x41, 0x8b, 0x09, 0x83, 0x0f, 0x15, 0x6d, 0x3a, 0x9a, 0x55,
-		0x1b, 0xcc, 0x49, 0xb9, 0x65, 0x6c, 0x4e, 0x02, 0x57, 0x63, 0x17, 0x69,
-		0xb5, 0x2f, 0x19, 0xf2, 0x05, 0x26, 0xbe, 0x9a, 0x3e, 0x1b, 0x63, 0xc9,
-		0x0d, 0x67, 0x4b, 0x5a, 0xe7, 0xcb, 0xdd, 0xe5, 0xd2, 0x6e, 0x47, 0xe3,
-		0x4c, 0x99, 0xf3, 0xe9, 0x93, 0x52, 0x49, 0x7d, 0x4c, 0xf4, 0x60, 0x41,
-		0xab, 0x14, 0xdd, 0xba, 0x03, 0x3a, 0x81, 0x7c, 0x70, 0x03, 0x47, 0xf7,
-		0x8c, 0x8a, 0xde, 0xea, 0x98, 0x18, 0x39, 0x89, 0xbc, 0xd3, 0x02, 0xdb,
-		0xc7, 0x37, 0x3a, 0xb4, 0xee, 0x09, 0x46, 0x68, 0x7b, 0x0a, 0xb8, 0x37,
-		0xd4, 0xf8, 0x36, 0x7d, 0x30, 0x1c, 0x93, 0xee, 0x40, 0xe0, 0x01, 0x1b,
-		0x6c, 0x58, 0xb9, 0xf4, 0xc2, 0x79, 0x6b, 0xaf, 0xcd, 0x9d, 0xb4, 0x6a,
-		0xd3, 0x88, 0x28, 0xb3, 0xdb, 0xee, 0x7c, 0xb9, 0x4b, 0xd0, 0x23, 0x5e,
-		0xf3, 0xa8, 0x5f, 0x16, 0x94, 0x49, 0xe5, 0x9b, 0x09, 0x2a, 0x3e, 0xe1,
-		0x9b, 0xa5, 0x1a, 0xb7, 0xbc, 0xa8, 0x13, 0x9e, 0x52, 0x82, 0xc8, 0xd1,
-		0xc3, 0x3b, 0x97, 0x4d, 0x4c, 0xe6, 0xe2, 0x8b, 0x3d, 0xe8, 0xfb, 0x2f,
-		0x77, 0x1f, 0xf4, 0xa9, 0x20, 0xc6, 0x2a, 0x25, 0xe4, 0x1b, 0xf1, 0x5e,
-		0x16, 0xcc, 0x22, 0x8f, 0x76, 0x19, 0x3f, 0x29, 0x46, 0xad, 0x4f, 0x83,
-		0x37, 0xe9, 0x8f, 0x63, 0xad, 0xc0, 0x50, 0xc4, 0x97, 0xfb, 0xa4, 0xeb,
-		0x95, 0x7e, 0x58, 0x4d, 0x6c, 0x5c, 0x4d, 0x0e, 0xbd, 0xfc, 0x91, 0xd5,
-		0x66, 0xc3, 0xa0, 0x35, 0x02, 0x5a, 0x54, 0x76, 0x94, 0xd9, 0xf0, 0x3d,
-		0x31, 0x31, 0x22, 0xd7, 0xca, 0x25, 0x9b, 0x9a, 0xdd, 0xf6, 0x39, 0x4e,
-		0xde, 0x7b, 0x8c, 0x4e, 0x79, 0x5b, 0x4a, 0xe0, 0x48, 0x1f, 0xeb, 0x28,
-		0x18, 0x95, 0x2d, 0xf9, 0x66, 0x45, 0xd5, 0x81, 0x2c, 0x4f, 0x61, 0x91,
-		0x69, 0xf1, 0x2e, 0xe5, 0xbb, 0xa5, 0xd5, 0x68, 0x48, 0x18, 0x50, 0xee,
-		0x74, 0xc8, 0x4e, 0x53, 0x1a, 0x42, 0xe1, 0x7a, 0x52, 0xbf, 0x93, 0x1a,
-		0xbd, 0x22, 0xab, 0xf6, 0x7f, 0xa9, 0x5e, 0x9d, 0xd9, 0xaa, 0x59, 0x46,
-		0xfd, 0x5a, 0xe9, 0xc3, 0xe3, 0x23, 0xc3, 0xd2, 0x77, 0x3c, 0x97, 0x15,
-		0xc6, 0x35, 0x66, 0x4c, 0x53, 0x06, 0x54, 0x66, 0xdb, 0x38, 0xb8, 0xbb,
-		0xbd, 0x7b, 0x6b, 0xb3, 0x79, 0x8d, 0x17, 0xa1, 0x86, 0x91, 0xa0, 0xa8,
-		0x36, 0x43, 0xfc, 0x11, 0xb7, 0x8a, 0x1e, 0xe6, 0x38, 0x3a, 0xe0, 0x51,
-		0xb0, 0x61, 0x7c, 0x79, 0xaa, 0x21, 0x18, 0xdf, 0x72, 0x5f, 0x3f, 0xc4,
-		0xc6, 0xe3, 0x5d, 0x44, 0x7a, 0x16, 0x0c, 0xb8, 0xef, 0xbb, 0xd2, 0x1f,
-		0x0c, 0xac, 0xe4, 0x7f, 0xe4, 0xc2, 0x0b, 0x9a, 0x4c, 0xfa, 0x27, 0x79,
-		0x56, 0xce, 0xfd, 0xc5, 0x43, 0x5c, 0x50, 0x99, 0x64, 0xe1, 0x52, 0xc2,
-		0x77, 0xf9, 0x75, 0x59, 0x2b, 0xdc, 0x56, 0xff, 0x8f, 0x5f, 0x2d, 0xa3,
-		0x8e, 0xe0, 0x89, 0x42, 0xcb, 0x57, 0xa1, 0xae, 0xf4, 0x55, 0x8b, 0xef,
-		0x91, 0x03, 0xfd, 0xd6, 0x5a, 0x38, 0xb4, 0x27, 0x9c, 0x8e, 0x33, 0x15,
-		0x0d, 0xff, 0x4d, 0x95, 0xd1, 0xff, 0x52, 0xe2, 0x23, 0xd2, 0x53, 0x62,
-		0x6c, 0x45, 0x27, 0x4d, 0x4c, 0x83, 0x53, 0x0c, 0xf1, 0x2f, 0xd8, 0xc7,
-		0x7a, 0x75, 0xbd, 0x5b, 0x17, 0x5e, 0xe2, 0x77, 0x7c, 0xf9, 0xc7, 0xf5,
-		0x1d, 0xd7, 0x67, 0x58, 0x67, 0xff, 0x36, 0x9e, 0xf7, 0xae, 0xc7, 0x22,
-		0xdf, 0x69, 0xda, 0x6a, 0xfa, 0xc6, 0x6e, 0x58, 0xd4, 0xc6, 0x97, 0x66,
-		0x7f, 0xe8, 0x6e, 0x93, 0x9e, 0x21, 0xf2, 0x1f, 0x2e, 0x74, 0x29, 0x69,
-		0x4f, 0x05, 0x7a, 0x9e, 0xc4, 0x12, 0x3d, 0x1c, 0x88, 0x26, 0xaa, 0xce,
-		0x61, 0x03, 0x5d, 0xe7, 0xbc, 0x58, 0x68, 0x3e, 0x6c, 0xa1, 0x0c, 0xab,
-		0x5d, 0x51, 0xa5, 0x58, 0xca, 0x66, 0xaa, 0x06, 0xce, 0x06, 0xd5, 0x89,
-		0x23, 0x27, 0x15, 0xf0, 0x6b, 0x79, 0x7c, 0xc8, 0xe8, 0xf1, 0xea, 0x4f,
-		0x05, 0x9d, 0xce, 0xaf, 0x54, 0x1b, 0x41, 0x0b, 0x6c, 0x49, 0xe3, 0x3a,
-		0x7d, 0xef, 0xd5, 0x46, 0x7e, 0xd2, 0x1b, 0x46, 0x46, 0x1c, 0xa7, 0xf6,
-		0x98, 0x58, 0xd5, 0x46, 0x66, 0x91, 0xef, 0x4c, 0x85, 0x93, 0xd1, 0xb7,
-		0x74, 0x75, 0xcc, 0x7e, 0x35, 0x0f, 0x36, 0xc8, 0x9e, 0x9c, 0x5a, 0x3e,
-		0xb9, 0x1d, 0xcf, 0xce, 0x2d, 0x22, 0xa3, 0x1c, 0x82, 0xc8, 0xc8, 0xd4,
-		0x13, 0x4b, 0x5d, 0x89, 0xe7, 0x47, 0x16, 0xf5, 0xd1, 0x68, 0x69, 0x8e,
-		0x39, 0x9b, 0xbb, 0x28, 0x87, 0xa2, 0xb9, 0x56, 0xb5, 0x31, 0x30, 0x7b,
-		0x16, 0x0d, 0x09, 0xd1, 0x50, 0x1d, 0xca, 0x7d, 0x86, 0xc8, 0x50, 0xd7,
-		0x38, 0xbb, 0x28, 0x64, 0xbd, 0x50, 0xe4, 0xfe, 0x96, 0xba, 0xe2, 0xa7,
-		0xb6, 0x28, 0x72, 0x77, 0xcb, 0x61, 0x64, 0xbc, 0xf2, 0x79, 0xd9, 0x1f,
-		0x73, 0x63, 0xe0, 0x1c, 0x4b, 0x96, 0xe3, 0xc4, 0xd7, 0x36, 0xb3, 0xba,
-		0x57, 0xf9, 0x5e, 0x0a, 0x9a, 0x5b, 0xdd, 0x49, 0x38, 0xef, 0x0e, 0xca,
-		0x9d, 0x8a, 0xfa, 0xb9, 0xda, 0xf2, 0xe4, 0xc4, 0x40, 0xac, 0x9c, 0x29,
-		0x2c, 0x4f, 0x10, 0x34, 0x35, 0xf5, 0x2c, 0x06, 0x9c, 0xab, 0xc2, 0x5e,
-		0x1e, 0xdb, 0x1a, 0xe4, 0x3f, 0xba, 0x85, 0xdf, 0xe6, 0x64, 0x67, 0xab,
-		0xad, 0x11, 0x72, 0xfe, 0x9a, 0x7c, 0x53, 0xd7, 0xc2, 0x2b, 0xa2, 0xee,
-		0x88, 0x3b, 0xf5, 0xf3, 0x6b, 0xa9, 0xc5, 0x36, 0x03, 0x97, 0x67, 0xd3,
-		0xeb, 0xad, 0x85, 0xbe, 0x3e, 0x5d, 0x28, 0x6c, 0xee, 0x6b, 0xbe, 0x41,
-		0xe1, 0xb0, 0x09, 0x7e, 0xad, 0x93, 0xe4, 0x27, 0xf2, 0xbc, 0x9f, 0x1c,
-		0x47, 0x42, 0xbb, 0xb9, 0x1a, 0xab, 0xc8, 0xc6, 0xcd, 0x27, 0x2f, 0x4a,
-		0xfa, 0xb6, 0xbd, 0x48, 0x72, 0x8e, 0xb3, 0x91, 0xbe, 0x2d, 0x4d, 0x4e,
-		0x86, 0xb7, 0x36, 0x6a, 0xec, 0xd2, 0xd4, 0xbb, 0x92, 0xb4, 0x2e, 0x3e,
-		0xa3, 0xb7, 0x0b, 0x9d, 0xa3, 0xdd, 0xe0, 0xb2, 0xc0, 0x8f, 0xc1, 0x76,
-		0xba, 0x88, 0xbd, 0x04, 0x8b, 0x67, 0xb3, 0x5c, 0x83, 0xf1, 0x12, 0x14,
-		0x46, 0x92, 0xfc, 0x79, 0x60, 0xfc, 0x75, 0xce, 0xa0, 0x10, 0xff, 0x9e,
-		0xe3, 0xdd, 0xda, 0xc7, 0x12, 0xbe, 0x46, 0xc3, 0x3b, 0x85, 0x05, 0x6a,
-		0x1c, 0xd9, 0x7e, 0x6e, 0x3a, 0xfc, 0xf0, 0xf9, 0x47, 0x00, 0x00, 0x00,
-		0xff, 0xff, 0xac, 0x9c, 0xc9, 0x12, 0xc2, 0x17, 0x00, 0x00,
+		0x84, 0x18, 0x22, 0x36, 0x24, 0x79, 0x58, 0x70, 0xcc, 0xd2, 0xd6, 0x94,
+		0x34, 0x43, 0x7a, 0x2e, 0x74, 0xb7, 0xa4, 0x98, 0xa0, 0xff, 0xbe, 0xd5,
+		0xd3, 0xb7, 0xb9, 0x49, 0x16, 0x59, 0xf6, 0x61, 0x61, 0x4d, 0xc8, 0x68,
+		0xba, 0xaa, 0xab, 0xaa, 0xbf, 0xba, 0xf6, 0xec, 0x28, 0x27, 0x39, 0xcd,
+		0x58, 0x5a, 0x6e, 0xde, 0x54, 0x15, 0x79, 0x4d, 0x68, 0xb1, 0xd9, 0x32,
+		0xca, 0xe3, 0xbc, 0x4c, 0xb6, 0x0c, 0xc2, 0x89, 0x27, 0x4e, 0xa6, 0xe4,
+		0xe1, 0x31, 0x5a, 0x8c, 0xc7, 0xeb, 0x6d, 0xb1, 0x92, 0x59, 0x59, 0x90,
+		0xcd, 0x36, 0x4b, 0xc2, 0x88, 0xfc, 0x18, 0x13, 0xe2, 0xd6, 0xc4, 0x7f,
+		0xcc, 0x0a, 0x21, 0x1c, 0xe4, 0x96, 0x17, 0x64, 0x49, 0x65, 0x1a, 0xaf,
+		0x59, 0x59, 0xf2, 0x30, 0xbc, 0x26, 0x97, 0xfa, 0x9d, 0xd3, 0x22, 0x29,
+		0xf3, 0x30, 0x8a, 0xc8, 0x2b, 0x72, 0xf5, 0xfd, 0xfa, 0x0a, 0xff, 0xa2,
+		0x7a, 0x53, 0xe3, 0x2f, 0x96, 0xe5, 0x67, 0xc9, 0xb3, 0x62, 0x13, 0x5e,
+		0xff, 0xb7, 0x4f, 0x14, 0xdb, 0x27, 0x61, 0xa8, 0x68, 0x14, 0x21, 0x87,
+		0xb1, 0xd3, 0x58, 0xdb, 0x70, 0x69, 0x1f, 0x93, 0xd9, 0xe4, 0xd4, 0x8b,
+		0x17, 0x3c, 0xc4, 0xd2, 0x78, 0x2c, 0xc6, 0x87, 0xf1, 0xd8, 0xc3, 0x11,
+		0xaf, 0xca, 0x42, 0xf2, 0x92, 0x31, 0xe0, 0xe1, 0x64, 0x89, 0xcb, 0xb7,
+		0x92, 0x33, 0xc4, 0xc8, 0x21, 0x11, 0x5e, 0x88, 0x55, 0x59, 0xc1, 0x94,
+		0x5c, 0xa4, 0x52, 0x56, 0xf8, 0x10, 0x2b, 0xf5, 0x22, 0xb3, 0x1c, 0xca,
+		0xad, 0xd4, 0x20, 0x69, 0x96, 0x78, 0x45, 0x57, 0x29, 0x20, 0xf8, 0x3f,
+		0x0e, 0x0b, 0xbf, 0x58, 0x71, 0xd8, 0x65, 0xb0, 0x7f, 0xc3, 0xd8, 0x7b,
+		0xa0, 0x09, 0x70, 0x81, 0x0c, 0x6b, 0xca, 0x04, 0xa0, 0x0b, 0x1c, 0x13,
+		0xec, 0xa0, 0x90, 0xe2, 0x23, 0x14, 0x09, 0x22, 0xd1, 0x95, 0x50, 0x13,
+		0x6f, 0xcb, 0x6d, 0x21, 0x91, 0x72, 0xd5, 0x25, 0xdc, 0x95, 0x05, 0x0c,
+		0xad, 0xbf, 0xc3, 0xb3, 0x40, 0xa2, 0x29, 0x9e, 0x24, 0x24, 0xe5, 0xf2,
+		0xad, 0xa2, 0x2b, 0x33, 0xcc, 0x19, 0xc3, 0x82, 0xe6, 0x78, 0x26, 0xca,
+		0x37, 0x62, 0x4a, 0x36, 0xec, 0xb9, 0x4a, 0x33, 0x44, 0xc5, 0xfa, 0x5f,
+		0xc5, 0x16, 0xdc, 0xdf, 0x21, 0xbf, 0x0e, 0x94, 0x45, 0xbd, 0x8a, 0x0c,
+		0xa2, 0x64, 0x10, 0xb3, 0x72, 0x13, 0x06, 0x9f, 0x95, 0x54, 0x65, 0x79,
+		0xad, 0x99, 0x4c, 0x02, 0xc4, 0x5a, 0xc9, 0xc4, 0x47, 0x30, 0x21, 0xfb,
+		0x4c, 0xa6, 0x24, 0x4b, 0xf4, 0xb2, 0x92, 0xa4, 0x56, 0x83, 0xc8, 0x0b,
+		0x57, 0x07, 0x36, 0xfe, 0xcb, 0x92, 0x1b, 0xc5, 0x32, 0x35, 0xaf, 0x4a,
+		0xc8, 0x4d, 0xfd, 0xbf, 0x5d, 0xa9, 0x0f, 0x00, 0xc8, 0x55, 0xc0, 0x9e,
+		0xdc, 0x51, 0x09, 0x61, 0x64, 0x49, 0xab, 0x32, 0xaf, 0x18, 0x48, 0xdc,
+		0x50, 0xe3, 0x6b, 0x97, 0xd7, 0x35, 0x10, 0x9d, 0x45, 0x75, 0xd6, 0x1b,
+		0x7d, 0x62, 0xb3, 0xe2, 0xce, 0x7d, 0xe3, 0x7f, 0x3a, 0x1a, 0xc8, 0x5b,
+		0x46, 0x05, 0xee, 0x70, 0x90, 0x45, 0xce, 0x64, 0x42, 0xe6, 0x73, 0xf2,
+		0xee, 0xfe, 0xb7, 0xe5, 0x5b, 0xf2, 0x94, 0x49, 0x34, 0x56, 0xc8, 0x67,
+		0x47, 0xca, 0xd6, 0xa1, 0x4c, 0x33, 0x11, 0x6b, 0x23, 0x9a, 0x9b, 0x5c,
+		0x98, 0x07, 0x4f, 0x9b, 0x59, 0x82, 0xf9, 0x0a, 0x3c, 0x70, 0xc4, 0x43,
+		0x4f, 0x80, 0x3d, 0xdc, 0x51, 0x11, 0x62, 0xbb, 0x5a, 0x81, 0x10, 0x43,
+		0x32, 0x1a, 0x5c, 0x7b, 0xca, 0x0b, 0x74, 0x54, 0xb0, 0x50, 0x46, 0x57,
+		0x3a, 0xde, 0x0c, 0xdf, 0xc1, 0x9e, 0x36, 0xc1, 0x88, 0x3a, 0x7a, 0xd2,
+		0x04, 0x94, 0x15, 0x83, 0x71, 0xfb, 0x80, 0x8e, 0x7b, 0x74, 0xac, 0xd6,
+		0xb3, 0xca, 0xfa, 0x85, 0x5b, 0x05, 0x77, 0x10, 0x45, 0xe2, 0x5b, 0xf0,
+		0xa4, 0x6e, 0x50, 0x5f, 0x5e, 0x2e, 0xce, 0x82, 0xb1, 0x15, 0x89, 0x26,
+		0xea, 0x1b, 0x71, 0x08, 0xf1, 0x79, 0x91, 0x58, 0x43, 0x40, 0x00, 0x63,
+		0xe4, 0xb8, 0xf4, 0x5b, 0x63, 0xfb, 0x4f, 0x2b, 0x20, 0xae, 0x70, 0x84,
+		0x83, 0xf8, 0x6a, 0x88, 0x38, 0xe4, 0xe5, 0x0e, 0x6c, 0xa6, 0x59, 0xef,
+		0x10, 0x5d, 0x5e, 0x17, 0x3d, 0x07, 0x1f, 0x9a, 0x91, 0x7e, 0xc4, 0x71,
+		0xfd, 0xca, 0xd0, 0x84, 0xb7, 0x81, 0x6d, 0xcf, 0x2d, 0x35, 0x4d, 0x85,
+		0x84, 0xb7, 0xc7, 0x29, 0xd4, 0x86, 0x1e, 0x51, 0xd9, 0x42, 0xee, 0x0e,
+		0xfe, 0x14, 0x6e, 0xe8, 0x7f, 0x18, 0x74, 0x7e, 0xff, 0x5c, 0xb3, 0x59,
+		0x1f, 0x21, 0x8c, 0xe9, 0x17, 0xc2, 0xf6, 0x78, 0x18, 0x36, 0xe5, 0xf5,
+		0x0a, 0x72, 0x93, 0x68, 0xb2, 0xcc, 0xd4, 0xf6, 0xa6, 0x01, 0x07, 0xfd,
+		0x7a, 0x54, 0x39, 0x62, 0x0e, 0x7d, 0x96, 0x5a, 0x81, 0xf5, 0x92, 0x11,
+		0x0e, 0xba, 0x45, 0xfa, 0x7a, 0x9e, 0x63, 0xca, 0xd3, 0x0d, 0x88, 0xbb,
+		0x4c, 0x54, 0x8c, 0x3e, 0xd7, 0xfe, 0xeb, 0x79, 0xc3, 0x6c, 0xbe, 0x08,
+		0x27, 0xff, 0xb6, 0xfc, 0x33, 0xd5, 0xf6, 0x68, 0x56, 0x00, 0x27, 0x92,
+		0x3e, 0x31, 0x20, 0xf2, 0xa9, 0x4c, 0x9e, 0xd1, 0xf5, 0x93, 0x28, 0x66,
+		0x50, 0x6c, 0x64, 0xda, 0x51, 0xc4, 0x61, 0xcd, 0x41, 0xa4, 0x43, 0xe2,
+		0x6d, 0xa6, 0xf7, 0x5a, 0x4c, 0x18, 0x7c, 0x28, 0x69, 0xdd, 0xd1, 0xac,
+		0xda, 0x60, 0x4a, 0x8a, 0x2d, 0x63, 0x53, 0x12, 0xb8, 0x1a, 0x3b, 0x4b,
+		0xca, 0x7d, 0xc1, 0x90, 0x2f, 0x30, 0xf1, 0x55, 0xf7, 0xd9, 0x18, 0x4b,
+		0x6e, 0x38, 0x99, 0xd3, 0x2a, 0x9b, 0xef, 0xae, 0xe7, 0x76, 0x3b, 0x1a,
+		0x67, 0xca, 0x9c, 0x4f, 0x9f, 0x84, 0x4a, 0xea, 0x63, 0xa2, 0x03, 0x0b,
+		0x5a, 0xa5, 0xe8, 0xd6, 0x1d, 0xd0, 0x0a, 0xe4, 0x83, 0x1b, 0x38, 0xda,
+		0x67, 0x54, 0xf4, 0x46, 0xc7, 0xc4, 0xc8, 0x59, 0xc9, 0xa5, 0x16, 0xd8,
+		0x3c, 0xbe, 0xd1, 0xa1, 0x75, 0x8f, 0x30, 0x42, 0x9b, 0x53, 0xc0, 0x83,
+		0xa1, 0xc6, 0xf7, 0xc9, 0xa3, 0xe1, 0x18, 0xb5, 0x07, 0x02, 0x0f, 0x58,
+		0x6f, 0xc3, 0xc2, 0xa5, 0x17, 0xce, 0x5b, 0x7b, 0x6d, 0xee, 0xa8, 0x51,
+		0x9b, 0x06, 0x44, 0x99, 0xdd, 0x76, 0xe7, 0xf9, 0x2e, 0x41, 0x8f, 0x78,
+		0xcd, 0x83, 0x7e, 0x99, 0x51, 0x26, 0x95, 0x6f, 0x46, 0xa8, 0xf8, 0x84,
+		0x6f, 0xe6, 0x6a, 0xdc, 0xf2, 0xa2, 0x4e, 0x78, 0x4a, 0x09, 0x22, 0x47,
+		0x0f, 0xef, 0x5c, 0x36, 0x32, 0x99, 0x8b, 0x2f, 0xf6, 0xa0, 0xef, 0xbf,
+		0x2c, 0x3f, 0xe8, 0x53, 0x41, 0x8c, 0x55, 0x4a, 0xc8, 0x37, 0xe2, 0xbd,
+		0xcc, 0x99, 0x45, 0x1e, 0xed, 0x32, 0x7e, 0x52, 0x8c, 0x5a, 0x9f, 0x06,
+		0x6f, 0xd4, 0x1d, 0xc7, 0x1a, 0x81, 0xa1, 0x88, 0xe7, 0xfb, 0xa4, 0xed,
+		0x95, 0x6e, 0x58, 0x8d, 0x6c, 0x5c, 0x8d, 0x0e, 0x9d, 0xfc, 0x91, 0xe5,
+		0x66, 0xc3, 0xa0, 0x31, 0x02, 0x5a, 0x54, 0x76, 0x94, 0xd9, 0xf0, 0x3d,
+		0x31, 0x31, 0x22, 0xd7, 0xc2, 0x25, 0x9b, 0x9a, 0xdd, 0xf6, 0x19, 0x4e,
+		0xde, 0x7b, 0x8c, 0x4e, 0x79, 0x5f, 0x48, 0xe0, 0x48, 0x1f, 0xea, 0x28,
+		0x18, 0x95, 0x0d, 0xf9, 0x66, 0x45, 0xd5, 0x81, 0x34, 0x4b, 0x60, 0x96,
+		0x6a, 0xf1, 0x2e, 0xe5, 0xdb, 0xa5, 0xd5, 0x68, 0x58, 0x31, 0xa0, 0xdc,
+		0xe9, 0x90, 0xad, 0xa6, 0xd4, 0x87, 0xc2, 0xf5, 0xa4, 0x6e, 0x27, 0x35,
+		0x7a, 0x45, 0x5a, 0xee, 0xff, 0x52, 0xbd, 0x3a, 0xb3, 0x55, 0xb3, 0x8c,
+		0xba, 0xb5, 0xd2, 0x87, 0xc7, 0x47, 0x86, 0xa5, 0xef, 0x78, 0x2e, 0x2b,
+		0x8c, 0x2b, 0xcc, 0x98, 0xba, 0x0c, 0xa8, 0xcc, 0xb6, 0x71, 0xb0, 0xbc,
+		0x5f, 0xbe, 0xb5, 0xd9, 0xbc, 0xc6, 0x8b, 0x50, 0xcd, 0x48, 0x50, 0x54,
+		0x93, 0x21, 0xfe, 0x88, 0x5b, 0x45, 0x07, 0x73, 0x1c, 0x1d, 0xf0, 0x28,
+		0xd8, 0x30, 0xbe, 0x3c, 0x57, 0x10, 0x0c, 0x6f, 0x79, 0xa8, 0x1e, 0x63,
+		0xe3, 0xf1, 0x36, 0x22, 0x1d, 0x0b, 0x7a, 0xdc, 0x0f, 0x6d, 0xe9, 0x8f,
+		0x06, 0x56, 0xf2, 0x3f, 0x72, 0xe5, 0x05, 0x8d, 0x46, 0xdd, 0x93, 0xbc,
+		0x28, 0xe7, 0xe1, 0xea, 0x31, 0xce, 0xa9, 0x5c, 0xa5, 0xe1, 0x5c, 0xc2,
+		0x77, 0xf9, 0x75, 0x5e, 0x29, 0xdc, 0x16, 0xff, 0x8f, 0x5f, 0xcd, 0xa3,
+		0x96, 0xe0, 0x91, 0x42, 0xcb, 0x57, 0xa1, 0xb6, 0xf4, 0x45, 0x83, 0xef,
+		0x89, 0x03, 0xfd, 0xd6, 0x58, 0x38, 0x34, 0x27, 0x9c, 0x96, 0x33, 0x15,
+		0x0d, 0xff, 0x8d, 0x95, 0xd1, 0xff, 0x52, 0xe2, 0x23, 0xd2, 0x51, 0x62,
+		0x6c, 0x45, 0x27, 0x8d, 0x4c, 0x83, 0x53, 0x0c, 0xf1, 0x2f, 0xd8, 0xc7,
+		0x3a, 0x75, 0xbd, 0x5d, 0x17, 0xce, 0xf1, 0x3b, 0xbe, 0xfc, 0xe3, 0xfa,
+		0x96, 0xeb, 0x53, 0xac, 0xb3, 0x7f, 0x1b, 0xcf, 0x7b, 0xd7, 0x63, 0x91,
+		0x6f, 0x35, 0x6d, 0x35, 0x7d, 0x63, 0x37, 0xcc, 0x2b, 0xe3, 0x4b, 0xb3,
+		0x3f, 0x74, 0xb7, 0x49, 0xcf, 0x10, 0xf9, 0x0f, 0x17, 0xba, 0x94, 0x34,
+		0xa7, 0x02, 0x3d, 0x4f, 0x62, 0x89, 0xee, 0x0f, 0x44, 0x23, 0x55, 0xe7,
+		0xb0, 0x81, 0xae, 0x33, 0x9e, 0xcf, 0x34, 0x1f, 0xb6, 0x50, 0x86, 0xd5,
+		0x2e, 0x2f, 0x13, 0x2c, 0x65, 0x13, 0x55, 0x03, 0x27, 0xbd, 0xea, 0xc4,
+		0x91, 0x93, 0x0a, 0xf8, 0xb5, 0x38, 0x3e, 0x64, 0x74, 0x78, 0xf5, 0xa7,
+		0x82, 0x56, 0xe7, 0x57, 0xaa, 0x8d, 0xa0, 0x19, 0xb6, 0xa4, 0x61, 0x9d,
+		0xbe, 0xf7, 0x6a, 0x23, 0x3f, 0xe9, 0x0d, 0x03, 0x23, 0x8e, 0x53, 0x7b,
+		0x4c, 0xac, 0x6a, 0x23, 0x93, 0xc8, 0x77, 0xa6, 0xdc, 0xc9, 0xe8, 0x5a,
+		0xba, 0x38, 0x66, 0xbf, 0x9a, 0x07, 0x6b, 0x64, 0x4f, 0x4e, 0x2d, 0x9f,
+		0xdc, 0x8e, 0x17, 0xe7, 0x16, 0x91, 0x52, 0x0e, 0x41, 0x64, 0x64, 0xea,
+		0x89, 0xa5, 0x2a, 0xc5, 0xcb, 0x23, 0x8b, 0xfa, 0x68, 0x34, 0x37, 0xc7,
+		0x9c, 0x4c, 0x5d, 0x94, 0x43, 0x5e, 0x5f, 0xab, 0x9a, 0x18, 0x98, 0x3d,
+		0xb3, 0x9a, 0x84, 0x68, 0xa8, 0x0e, 0xe5, 0x3e, 0x43, 0xa4, 0xa8, 0x6b,
+		0x98, 0x5d, 0xe4, 0xb2, 0x9a, 0x29, 0x72, 0x77, 0x4b, 0x55, 0xf2, 0x53,
+		0x5b, 0x14, 0xb9, 0xbd, 0xe5, 0x30, 0x30, 0x5e, 0xf9, 0xbc, 0xec, 0x8e,
+		0xb9, 0x31, 0x70, 0x8e, 0x25, 0xcb, 0x71, 0xe2, 0x6b, 0x93, 0x59, 0xdd,
+		0xab, 0x7c, 0x2f, 0x05, 0xcd, 0xad, 0xee, 0x24, 0x9c, 0xb7, 0x07, 0xe5,
+		0x56, 0x45, 0xfd, 0x5c, 0x6e, 0xf9, 0xea, 0xc4, 0x40, 0xac, 0x9c, 0x29,
+		0x2c, 0x4f, 0x10, 0xd4, 0x35, 0xf5, 0x22, 0x06, 0x9c, 0xab, 0xc2, 0x4e,
+		0x1e, 0xdb, 0x1a, 0xe4, 0x3f, 0xba, 0x85, 0xdf, 0xa6, 0x64, 0x67, 0xab,
+		0xad, 0x11, 0x72, 0xf9, 0x9a, 0x7c, 0x53, 0xd7, 0xc2, 0x1b, 0xa2, 0xee,
+		0x88, 0x3b, 0xf5, 0xf3, 0x6b, 0xa1, 0xc5, 0xd6, 0x03, 0x97, 0x67, 0xd3,
+		0xeb, 0x8d, 0x85, 0xae, 0x3e, 0x5d, 0x28, 0x6c, 0xee, 0x6b, 0xbe, 0x5e,
+		0xe1, 0xb0, 0x09, 0x7e, 0xab, 0x93, 0xe4, 0x27, 0xf2, 0xbc, 0x9b, 0x1c,
+		0x47, 0x42, 0xbb, 0xbe, 0x1a, 0xab, 0xc8, 0xc6, 0xcd, 0x27, 0x2f, 0x4a,
+		0xfa, 0xb6, 0x3d, 0x5b, 0x65, 0x1c, 0x67, 0x23, 0x7d, 0x5b, 0x32, 0x03,
+		0xb9, 0xd6, 0x7e, 0xde, 0x7d, 0xa9, 0x73, 0x1b, 0x69, 0xdc, 0x79, 0x06,
+		0x2f, 0x16, 0x3a, 0x3d, 0xdb, 0x71, 0x65, 0x31, 0x1f, 0x42, 0xec, 0x74,
+		0xfd, 0x3a, 0x07, 0x86, 0x17, 0x13, 0x5c, 0xe3, 0x70, 0x16, 0x00, 0x2f,
+		0x5f, 0x4a, 0x2c, 0x1c, 0xfe, 0xfe, 0x66, 0xce, 0x1e, 0xff, 0x9e, 0xe1,
+		0x65, 0xda, 0x07, 0x0f, 0xbe, 0x46, 0xfd, 0x4b, 0x84, 0x85, 0x67, 0x18,
+		0xcf, 0x6e, 0x32, 0x3a, 0xd4, 0xf0, 0xf9, 0x47, 0x00, 0x00, 0x00, 0xff,
+		0xff, 0x6b, 0x2c, 0x3b, 0xd9, 0xb3, 0x17, 0x00, 0x00,
 		},
 		"assets/js/controllers.js",
 	)
diff --git a/mailhog/http/api/v1.go b/mailhog/http/api/v1.go
index eab88bd..0c8b270 100644
--- a/mailhog/http/api/v1.go
+++ b/mailhog/http/api/v1.go
@@ -33,13 +33,13 @@ func CreateAPIv1(exitCh chan int, conf *config.Config, server *http.Server) *API
 		server: server,
 	}
 
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/?$"), apiv1.messages)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/delete/?$"), apiv1.delete_all)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/?$"), apiv1.message)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/delete/?$"), apiv1.delete_one)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/download/?$"), apiv1.download)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/mime/part/(\\d+)/download/?$"), apiv1.download_part)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/release/?$"), apiv1.release_one)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/api/v1/messages/?$"), apiv1.messages)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"DELETE"},regexp.MustCompile("^/api/v1/messages/?$"), apiv1.delete_all)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/?$"), apiv1.message)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"DELETE"},regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/?$"), apiv1.delete_one)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/download/?$"), apiv1.download)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/mime/part/(\\d+)/download/?$"), apiv1.download_part)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"POST"},regexp.MustCompile("^/api/v1/messages/([0-9a-f]+)/release/?$"), apiv1.release_one)
 
 	return apiv1
 }
@@ -65,6 +65,7 @@ func (apiv1 *APIv1) messages(w http.ResponseWriter, r *http.Request, route *hand
 }
 
 func (apiv1 *APIv1) message(w http.ResponseWriter, r *http.Request, route *handler.Route) {
+
 	match := route.Pattern.FindStringSubmatch(r.URL.Path)
 	id := match[1]
 	log.Printf("[APIv1] GET /api/v1/messages/%s\n", id)
@@ -148,7 +149,7 @@ func (apiv1 *APIv1) download_part(w http.ResponseWriter, r *http.Request, route
 }
 
 func (apiv1 *APIv1) delete_all(w http.ResponseWriter, r *http.Request, route *handler.Route) {
-	log.Println("[APIv1] POST /api/v1/messages/delete")
+	log.Println("[APIv1] POST /api/v1/messages")
 
 	w.Header().Set("Content-Type", "text/json")
 	switch apiv1.config.Storage.(type) {
diff --git a/mailhog/http/handler/regexp.go b/mailhog/http/handler/regexp.go
index 5e9d7a5..a5e6cda 100644
--- a/mailhog/http/handler/regexp.go
+++ b/mailhog/http/handler/regexp.go
@@ -8,6 +8,7 @@ import (
 // http://stackoverflow.com/questions/6564558/wildcards-in-the-pattern-for-http-handlefunc
 
 type Route struct {
+    Methods map[string]int
     Pattern *regexp.Regexp
     Handler HandlerFunc
 }
@@ -23,19 +24,30 @@ type RegexpHandler struct {
     routes []*Route
 }
 
-func (h *RegexpHandler) Handler(pattern *regexp.Regexp, handler HandlerFunc) {
-    h.routes = append(h.routes, &Route{pattern, handler})
+func (h *RegexpHandler) Handler(methods []string, pattern *regexp.Regexp, handler HandlerFunc) {
+    m := make(map[string]int,0)
+    for _, v := range methods {
+        m[v] = 1
+    }
+    h.routes = append(h.routes, &Route{m, pattern, handler})
 }
 
-func (h *RegexpHandler) HandleFunc(pattern *regexp.Regexp, handler func(http.ResponseWriter, *http.Request, *Route)) {
-    h.routes = append(h.routes, &Route{pattern, HandlerFunc(handler)})
+func (h *RegexpHandler) HandleFunc(methods []string, pattern *regexp.Regexp, handler func(http.ResponseWriter, *http.Request, *Route)) {
+    m := make(map[string]int,0)
+    for _, v := range methods {
+        m[v] = 1
+    }
+    h.routes = append(h.routes, &Route{m, pattern, HandlerFunc(handler)})
 }
 
 func (h *RegexpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
     for _, route := range h.routes {
         if route.Pattern.MatchString(r.URL.Path) {
-            route.Handler.ServeHTTP(w, r, route)
-            return
+            _, ok := route.Methods[r.Method]
+            if ok {
+                route.Handler.ServeHTTP(w, r, route)
+                return
+            }
         }
     }
     // no pattern matched; send 404 response
diff --git a/mailhog/http/server.go b/mailhog/http/server.go
index 086366f..74d8a0d 100644
--- a/mailhog/http/server.go
+++ b/mailhog/http/server.go
@@ -72,12 +72,12 @@ func Start(exitCh chan int, conf *config.Config) {
 		Handler: &handler.RegexpHandler{},
 	}
 
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/exit/?$"), web_exit)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/js/controllers.js$"), web_jscontroller)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/images/hog.png$"), web_imgcontroller)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/images/github.png$"), web_img_github)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/images/ajax-loader.gif$"), web_img_ajaxloader)
-	server.Handler.(*handler.RegexpHandler).HandleFunc(regexp.MustCompile("^/$"), web_index)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/exit/?$"), web_exit)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/js/controllers.js$"), web_jscontroller)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/images/hog.png$"), web_imgcontroller)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/images/github.png$"), web_img_github)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/images/ajax-loader.gif$"), web_img_ajaxloader)
+	server.Handler.(*handler.RegexpHandler).HandleFunc([]string{"GET"},regexp.MustCompile("^/$"), web_index)
 
 	api.CreateAPIv1(exitCh, conf, server)