diff --git a/themes/integral/templates/mailbox/_show.html b/themes/integral/templates/mailbox/_show.html
index bf83fcb..4ca2c55 100644
--- a/themes/integral/templates/mailbox/_show.html
+++ b/themes/integral/templates/mailbox/_show.html
@@ -1,21 +1,22 @@
 {{$name := .name}}
 {{$id := .message.Id}}
 <div id="emailActions">
-	<a href="javascript:deleteMessage('{{.message.Id}}');">Delete</a>
-	<a href="javascript:messageSource('{{.message.Id}}');">Source</a>
-	{{if .htmlAvailable}}
-	<a href="javascript:htmlView('{{.message.Id}}');">HTML</a>
-	{{end}}
+  <a href="/link/{{$name}}/{{$id}}">Link</a>
+  <a href="javascript:deleteMessage('{{.message.Id}}');">Delete</a>
+  <a href="javascript:messageSource('{{.message.Id}}');">Source</a>
+  {{if .htmlAvailable}}
+    <a href="javascript:htmlView('{{.message.Id}}');">HTML</a>
+  {{end}}
 </div>
 <table id="emailHeader">
-	<tr>
-		<th>From:</th>
-		<td>{{.message.From}}</td>
-	</tr>
-	<tr>
-		<th>Date:</th>
-		<td>{{.message.Date}}</td>
-	</tr>
+  <tr>
+    <th>From:</th>
+    <td>{{.message.From}}</td>
+  </tr>
+  <tr>
+    <th>Date:</th>
+    <td>{{.message.Date}}</td>
+  </tr>
 <table>
 
 {{with .attachments}}
diff --git a/themes/integral/templates/mailbox/index.html b/themes/integral/templates/mailbox/index.html
index 6581e18..bb13327 100644
--- a/themes/integral/templates/mailbox/index.html
+++ b/themes/integral/templates/mailbox/index.html
@@ -3,7 +3,8 @@
 
 {{define "script"}}
 <script>
-  function listLoaded() { 
+  var selected = "{{.selected}}"
+  function listLoaded() {
     $('.listEntry').hover(
     function() {
       $(this).addClass("listEntryHover")
@@ -19,6 +20,10 @@
     }
     )
     $("#messageList").slideDown()
+    if (selected != "") {
+      $("#" + selected).click()
+      selected = ""
+    }
   }
 
   function loadList() {
diff --git a/web/mailbox_controller.go b/web/mailbox_controller.go
index 9dac359..d7e6733 100644
--- a/web/mailbox_controller.go
+++ b/web/mailbox_controller.go
@@ -31,6 +31,8 @@ type JsonMessageBody struct {
 
 func MailboxIndex(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
 	name := req.FormValue("name")
+	selected := req.FormValue("id")
+
 	if len(name) == 0 {
 		ctx.Session.AddFlash("Account name is required", "errors")
 		http.Redirect(w, req, reverse("RootIndex"), http.StatusSeeOther)
@@ -40,9 +42,19 @@ func MailboxIndex(w http.ResponseWriter, req *http.Request, ctx *Context) (err e
 	return RenderTemplate("mailbox/index.html", w, map[string]interface{}{
 		"ctx":  ctx,
 		"name": name,
+		"selected": selected,
 	})
 }
 
+func MailboxLink(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
+	name := ctx.Vars["name"]
+	id := ctx.Vars["id"]
+
+	uri := fmt.Sprintf("%s?name=%s&id=%s", reverse("MailboxIndex"), name, id)
+	http.Redirect(w, req, uri, http.StatusSeeOther)
+	return nil
+}
+
 func MailboxList(w http.ResponseWriter, req *http.Request, ctx *Context) (err error) {
 	// Don't have to validate these aren't empty, Gorilla returns 404
 	name := ctx.Vars["name"]
diff --git a/web/server.go b/web/server.go
index 63a022e..ca754d6 100644
--- a/web/server.go
+++ b/web/server.go
@@ -34,6 +34,7 @@ func setupRoutes(cfg config.WebConfig) {
 	// Root
 	r.Path("/").Handler(handler(RootIndex)).Name("RootIndex").Methods("GET")
 	r.Path("/status").Handler(handler(RootStatus)).Name("RootStatus").Methods("GET")
+	r.Path("/link/{name}/{id}").Handler(handler(MailboxLink)).Name("MailboxLink").Methods("GET")
 	r.Path("/mailbox").Handler(handler(MailboxIndex)).Name("MailboxIndex").Methods("GET")
 	r.Path("/mailbox/{name}").Handler(handler(MailboxList)).Name("MailboxList").Methods("GET")
 	r.Path("/mailbox/{name}").Handler(handler(MailboxPurge)).Name("MailboxPurge").Methods("DELETE")