diff --git a/src/components/MailTable.vue b/src/components/MailTable.vue
index f1c5099..99e5114 100644
--- a/src/components/MailTable.vue
+++ b/src/components/MailTable.vue
@@ -47,10 +47,10 @@
         }
       }
 
-      function changeEmail(emails, {amount, archive, closeModal}){
+      function changeEmail(emails, {amount, toggleArchive, closeModal}){
         let index = emails.findIndex(e => e == openedEmail.value);
 
-        if(archive) { emails[index].archived = true }
+        if(toggleArchive) { emails[index].archived = !emails[index].archived }
         if(closeModal) { openedEmail.value = null; return null; }
 
         openEmail(emails[index + amount])
diff --git a/src/components/MailView.vue b/src/components/MailView.vue
index 48e3c13..ddd0334 100644
--- a/src/components/MailView.vue
+++ b/src/components/MailView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="email" v-if="email">
     <div class="toolbar">
-      <button @click="archive">Archive</button>
+      <button @click="toggleArchive">{{email.archived ? 'Move to Inbox' : 'Archive'}}</button>
       <button @click="goNewer">Newer</button>
       <button @click="goOlder">Older</button>
       <button @click="toggleRead(email)">Mark {{email.read ? 'Unread' : 'Read'}}</button>
@@ -21,9 +21,9 @@
     setup({email}, {emit}) {
       let goNewer = () => emit('changeEmail', {amount: -1})
       let goOlder = () => emit('changeEmail', {amount: 1})
-      let goNewerAndArchive = () => emit('changeEmail', {amount: -1, archive: true})
-      let goOlderAndArchive = () => emit('changeEmail', {amount: 1, archive: true})
-      let archive = () => emit('changeEmail', {archive: true, closeModal: true})
+      let goNewerAndArchive = () => emit('changeEmail', {amount: -1, toggleArchive: true})
+      let goOlderAndArchive = () => emit('changeEmail', {amount: 1, toggleArchive: true})
+      let toggleArchive = () => emit('changeEmail', {toggleArchive: true, closeModal: true})
       let toggleRead = (email) => { email.read = !email.read }
 
       useKeydown([
@@ -31,13 +31,13 @@
         {key: 'j', fn: goOlder},
         {key: '[', fn: goNewerAndArchive},
         {key: ']', fn: goOlderAndArchive},
-        {key: 'e', fn: archive}
+        {key: 'e', fn: toggleArchive}
       ])
 
       let emailMarkdown = marked(email.body);
       return {
         emailMarkdown,
-        archive,
+        toggleArchive,
         goNewer,
         goOlder,
         toggleRead