diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 79e4a34de..cd050c560 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -134,6 +134,8 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
     actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
     actionAlignJustify->setCheckable(true);
     
+    setupFormatActions();
+    
     /*ui.comboStyle->addItem("Standard");
     ui.comboStyle->addItem("Bullet List (Disc)");
     ui.comboStyle->addItem("Bullet List (Circle)");
@@ -687,6 +689,18 @@ void MessageComposer::setupInsertActions()
 
 }
 
+void MessageComposer::setupFormatActions()
+{
+    QMenu *menu = new QMenu(tr("&Format"), this);
+    menuBar()->addMenu(menu);
+
+    menu->addAction(actionAlignLeft);
+    menu->addAction(actionAlignCenter);
+    menu->addAction(actionAlignRight);
+    menu->addAction(actionAlignJustify);
+  
+}
+
 void MessageComposer::textBold()
 {
     QTextCharFormat fmt;
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index 1d9c56328..b251a728f 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -126,6 +126,7 @@ private:
 	void setupEditActions();
 	void setupViewActions();
 	void setupInsertActions();
+	void setupFormatActions();
 	
 	bool load(const QString &f);
 	bool maybeSave();