diff --git a/email_app/app/components/mail_inbox.js b/email_app/app/components/mail_inbox.js
index f9e1f59..b5b9f2e 100644
--- a/email_app/app/components/mail_inbox.js
+++ b/email_app/app/components/mail_inbox.js
@@ -34,7 +34,7 @@ export default class MailInbox extends Component {
       <div className="mail-list">
         <div className="mail-list-head">
           <div className="stats">
-            Inbox Space Used: <span className="highlight">{this.props.inboxSize}KB of {CONSTANTS.TOTAL_INBOX_SIZE}KB  </span>
+            Inbox Space Used: <span className="highlight">{this.props.inboxSize} of {CONSTANTS.TOTAL_INBOX_SIZE}</span>
           </div>
           <div className="options text-right">
             <button className="mdl-button mdl-js-button mdl-button--icon" title="Fetch emails" onClick={this.fetchMails}>
diff --git a/email_app/app/safenet_comm.js b/email_app/app/safenet_comm.js
index 4b9ac50..34be4f3 100644
--- a/email_app/app/safenet_comm.js
+++ b/email_app/app/safenet_comm.js
@@ -210,7 +210,8 @@ const writeEmailContent = (app, email, pk) => {
 
   return app.immutableData.create()
       .then((email) => email.write(encryptedEmail)
-        .then(() => email.close())
+        .then(() => app.cipherOpt.newPlainText())
+        .then((cipherOpt) => email.close(cipherOpt))
       );
 }