2 files changed, 6 insertions, 4 deletions

diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 39cbd47c..da5e9056 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -46,9 +46,9 @@ Item {
             value: root.currentMail
         }
         unread: root.isUnread
-        trash: root.isUnread
-        important: root.isUnread
-        draft: root.isUnread
+        trash: root.isTrash
+        important: root.isImportant
+        draft: root.isDraft
         operateOnThreads: mailListModel.isThreaded
     }
 
diff --git a/framework/src/domain/mailcontroller.cpp b/framework/src/domain/mailcontroller.cpp
index a6c5c555..ea0fe690 100644
--- a/framework/src/domain/mailcontroller.cpp
+++ b/framework/src/domain/mailcontroller.cpp
@@ -64,12 +64,14 @@ void MailController::updateActions()
         action_moveToTrash->setEnabled(!getTrash());
         action_restoreFromTrash->setEnabled(getTrash());
         action_markAsRead->setEnabled(getUnread());
-        action_markAsUnread->setEnabled(getUnread());
+        action_markAsUnread->setEnabled(!getUnread());
+        action_markAsImportant->setEnabled(!getImportant());
     } else {
         action_moveToTrash->setEnabled(false);
         action_restoreFromTrash->setEnabled(false);
         action_markAsRead->setEnabled(false);
         action_markAsUnread->setEnabled(false);
+        action_markAsImportant->setEnabled(false);
     }
 }