diff --git a/src/components/MailTable.vue b/src/components/MailTable.vue
index b05d466..7ecf21f 100644
--- a/src/components/MailTable.vue
+++ b/src/components/MailTable.vue
@@ -18,7 +18,7 @@
     </tbody>
   </table>
   <ModalView v-if="openedEmail" @closeModal="openedEmail = null">
-    <MailView :email="openedEmail" />
+    <MailView :email="openedEmail" @changeEmail="changeEmail" />
   </ModalView>
 </template>
 
@@ -53,14 +53,31 @@
     },
     methods: {
       openEmail(email) {
-        email.read = true
-        this.updateEmail(email)
         this.openedEmail = email
+
+        if(email) {
+          email.read = true
+          this.updateEmail(email)
+        }
       },
       archiveEmail(email) {
         email.archived = true
         this.updateEmail(email)
       },
+      changeEmail({toggleRead, toggleArchive, save, closeModal, changeIndex}) {
+        let email = this.openedEmail
+        if(toggleRead) { email.read = !email.read }
+        if(toggleArchive) { email.archived = !email.archived }
+        if(save) { this.updateEmail(email) }
+        if(closeModal) { this.openedEmail = null }
+
+        if(changeIndex) {
+          let emails = this.unarchivedEmails
+          let currentIndex = emails.indexOf(this.openedEmail)
+          let newEmail = emails[currentIndex + changeIndex]
+          this.openEmail(newEmail)
+        }
+      },
       updateEmail(email) {
         axios.put(`http://localhost:3000/emails/${email.id}`, email)
       }
diff --git a/src/components/MailView.vue b/src/components/MailView.vue
index 054c1a4..285c4c3 100644
--- a/src/components/MailView.vue
+++ b/src/components/MailView.vue
@@ -1,5 +1,11 @@
 <template>
   <div class="email-display">
+    <div>
+      <button @click="toggleArchive">{{email.archived ? 'Move to Inbox (e)' : 'Archive (e)'}}</button>
+      <button @click="toggleRead">{{email.read ? 'Mark Unread (r)' : 'Mark Read (r)'}}</button>
+      <button @click="goNewer">Newer (k)</button>
+      <button @click="goOlder">Older (j)</button>
+    </div>
     <h2 class="mb-0">Subject: <strong>{{email.subject}}</strong></h2>
     <div><em>From {{email.from}} on {{format(new Date(email.sentAt), 'MMM do yyyy')}}</em></div>
     <div v-html="marked(email.body)" />
@@ -9,11 +15,43 @@
 <script>
   import  { format } from 'date-fns'
   import marked from 'marked'
+  import axios from 'axios'
+  import useKeydown from '../composables/use-keydown'
+
   export default {
-    setup(){
+    setup(props, {emit}){
+      let email = props.email;
+      // let toggleRead = () => {
+      //   email.read = !email.read
+      //   axios.put(`http://localhost:3000/emails/${email.id}`, email)
+      // }
+      // let toggleArchive = () => {
+      //   email.archived = !email.archived
+      //   axios.put(`http://localhost:3000/emails/${email.id}`, email)
+      // }
+      let toggleRead = () => { emit('changeEmail', {toggleRead: true, save: true})}
+      let toggleArchive = () => { emit('changeEmail', {toggleArchive: true, save: true, closeModal: true})}
+      let goNewer = () => { emit('changeEmail', {changeIndex: -1})}
+      let goOlder = () => { emit('changeEmail', {changeIndex: 1})}
+      let goNewerAndArchive = () => { emit('changeEmail', {changeIndex: -1, toggleArchive: true, save: true})}
+      let goOlderAndArchive = () => { emit('changeEmail', {changeIndex: 1, toggleArchive: true, save: true})}
+
+      useKeydown([
+        {key: 'r', fn: toggleRead},
+        {key: 'e', fn: toggleArchive},
+        {key: 'k', fn: goNewer},
+        {key: 'j', fn: goOlder},
+        {key: '[', fn: goNewerAndArchive},
+        {key: ']', fn: goOlderAndArchive}
+      ])
+
       return {
         format,
-        marked
+        marked,
+        toggleRead,
+        toggleArchive,
+        goNewer,
+        goOlder
       }
     },
     props: {