diff --git a/src/js/controller/navigation.js b/src/js/controller/navigation.js
index 114b22e..f2b2ee6 100644
--- a/src/js/controller/navigation.js
+++ b/src/js/controller/navigation.js
@@ -40,14 +40,6 @@ define(function(require) {
             }
         };
 
-        $scope.openWriter = function(replyTo) {
-            $scope.writerReply = !! (replyTo);
-            $scope.writerOpen = true;
-        };
-        $scope.closeWriter = function() {
-            $scope.writerOpen = false;
-        };
-
         $scope.openFolder = function(folder) {
             $scope.currentFolder = folder;
             $scope.state.nav.toggle(false);
@@ -284,27 +276,27 @@ define(function(require) {
             elm.bind('keydown', function(e) {
                 var cs = scope.$$childTail;
 
-                if (e.keyCode === 78 && !cs.writerOpen) {
+                if (e.keyCode === 78 && !scope.state.writer.open) {
                     // n -> new mail
                     e.preventDefault();
-                    cs.openWriter();
+                    scope.state.writer.write();
 
-                } else if (e.keyCode === 82 && !cs.writerOpen && cs.selected) {
+                } else if (e.keyCode === 82 && !scope.state.writer.open && cs.selected) {
                     // r -> reply
                     e.preventDefault();
-                    cs.openWriter(cs.selected);
+                    scope.state.writer.write(cs.selected);
 
-                } else if (e.keyCode === 27 && cs.writerOpen) {
+                } else if (e.keyCode === 27 && scope.state.writer.open) {
                     // escape -> close writer
                     e.preventDefault();
-                    cs.closeWriter();
+                    scope.state.writer.close();
 
                 } else if (e.keyCode === 27 && cs.accountOpen) {
                     // escape -> close account view
                     e.preventDefault();
                     cs.closeAccount();
 
-                } else if (e.keyCode === 83 && !cs.writerOpen && cs.synchronize) {
+                } else if (e.keyCode === 83 && !scope.state.writer.open && cs.synchronize) {
                     // s -> sync folder
                     e.preventDefault();
                     cs.synchronize();
diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index d2ad26c..bac7cc6 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -20,14 +20,22 @@ define(function(require) {
         // Init
         //
 
-        $scope.$watch('writerOpen', function() {
-            resetFields();
-            if ($scope.writerReply) {
-                fillFields($scope.selected);
-                $scope.updatePreview();
+        $scope.state.writer = {
+            open: false,
+            write: function(replyTo) {
+                this.open = true;
+
+                resetFields();
+                if (replyTo) {
+                    fillFields(replyTo);
+                    $scope.updatePreview();
+                }
+                $scope.verifyTo();
+            },
+            close: function() {
+                this.open = false;
             }
-            $scope.verifyTo();
-        });
+        };
 
         function resetFields() {
             $scope.writerTitle = 'New email';
diff --git a/src/tpl/desktop.html b/src/tpl/desktop.html
index 5381bc7..4375cb7 100644
--- a/src/tpl/desktop.html
+++ b/src/tpl/desktop.html
@@ -19,7 +19,7 @@
 </div><!--/.nav-container-->
 
 <!-- lightbox  -->
-<div class="lightbox-overlay" ng-class="{'show': writerOpen}">
+<div class="lightbox-overlay" ng-class="{'show': state.writer.open}">
   <div class="lightbox lightbox-effect" ng-include="'tpl/write.html'"></div>
 </div>
 <div class="lightbox-overlay" ng-class="{'show': accountOpen}">
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 4a30410..f13d93a 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -1,7 +1,7 @@
 <div class="controls">
   <button ng-click="remove(selected)" class="btn-icon" title="Delete mail">&#xe005;</button>
-  <button ng-click="openWriter(selected)" class="btn-icon" title="Reply to">&#xe002;</button>
-  <button ng-click="openWriter()" class="btn-icon" title="New mail">&#xe006;</button>
+  <button ng-click="state.writer.write(selected)" class="btn-icon" title="Reply to">&#xe002;</button>
+  <button ng-click="state.writer.write()" class="btn-icon" title="New mail">&#xe006;</button>
 </div><!--/.controls-->
 
 <div class="view-read">
diff --git a/src/tpl/write.html b/src/tpl/write.html
index 50cb0db..6dc3a41 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -1,7 +1,7 @@
 <div class="lightbox-body" ng-controller="WriteCtrl">
   <header>
     <h2>{{writerTitle}}</h2>
-    <button class="close" ng-click="closeWriter()" data-action="lightbox-close">&#xe007;</button>
+    <button class="close" ng-click="state.writer.close()" data-action="lightbox-close">&#xe007;</button>
   </header>
   <div class="content">