diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index a1addb2f0..3696d6f33 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -660,7 +660,7 @@ void RsMessageModel::setMessages(const std::list<Rs::Msgs::MsgInfoSummary>& msgs
 	for(auto it(msgs.begin());it!=msgs.end();++it)
 	{
 		mMessagesMap[(*it).msgId] = mMessages.size();
-		mMessages.push_back(*it);
+        mMessages.push_back(*it);
 	}
 
 	// now update prow for all posts
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 2d7ca0371..b46dcd0f4 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -917,6 +917,8 @@ void MessagesDialog::changeBox(int box_row)
 		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
     }
 	else
 	{
@@ -1152,13 +1154,11 @@ void MessagesDialog::removemessage()
 
     bool doDelete = false;
     int listrow = ui.listWidget->currentRow();
-    if (listrow == ROW_TRASHBOX) {
+    if (listrow == ROW_TRASHBOX || listrow == ROW_OUTBOX)
+        doDelete = true;
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
         doDelete = true;
-    } else {
-        if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
-            doDelete = true;
-        }
-    }
 
     foreach (const QString& m, selectedMessages) {
         if (doDelete) {