diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 8e6376e66..6a4857c47 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -115,6 +115,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     _bandwidthGraph = new BandwidthGraph();
     messengerWindow = new MessengerWindow();
     messengerWindow->hide();
+    //messengerWindow->show();
     applicationWindow = new ApplicationWindow();
     applicationWindow->hide();
 	
@@ -196,6 +197,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     ui.toolBar->addSeparator();
     connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
        
+    /* Select the first action */
+    grp->actions()[0]->setChecked(true);
 
     // Allow to play files from SharedFilesDialog.
     connect(sharedfilesDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
@@ -211,16 +214,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     toolAct->setText("Service");
     toolAct->setShortcut(tr("Ctrl+T"));
     toolAct->setIcon(QIcon(":/images/blockdevice2.png"));
-    ui.toolBar->addAction(toolAct);
+    //ui.toolBar->addAction(toolAct);
  
-
-    /* Select the first action */
-    grp->actions()[0]->setChecked(true);
-    /* Select the first action */
         /* Create the Service pages and actions */
     QActionGroup *servicegrp = new QActionGroup(this);
    
                            
+#if 0
     LinksDialog *linksDialog = NULL;
     ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages),
                        createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), servicegrp));
@@ -237,6 +237,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages),
                       createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), servicegrp)); 
                          
+#endif
                                       
     
     /* Create the toolbarservice */
diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 9518c3bf3..76c1f0ef4 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -465,7 +465,6 @@ void MessagesDialog::insertMsgTxtAndFiles()
 		ui.filesText->setText("");
 
 		ui.subjectText->setText("");
-		//ui.msgText->setText("");
 		ui.msgList->clear();
 
 		return;
@@ -574,7 +573,7 @@ void MessagesDialog::insertMsgTxtAndFiles()
 	ui.fromText->setText(QString::fromStdString(rsPeers->getPeerName(msgInfo.srcId)));
 
 	ui.subjectText->setText(QString::fromStdWString(msgInfo.title));
-	ui.msgText->setText(QString::fromStdWString(msgInfo.msg));
+	ui.msgText->setHtml(QString::fromStdWString(msgInfo.msg));
 
 	{
 		std::ostringstream out;
diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 04b8ac8c1..93f88d2d1 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -104,20 +104,23 @@ MessengerWindow::MessengerWindow(QWidget * parent)
 	ui.statuscomboBox->setMinimumWidth(20);
 	ui.messagecomboBox->setMinimumWidth(20);
 	ui.searchlineEdit->setMinimumWidth(20);
-  
-  	QPixmap Backpixmap((QString)":/images/backgroundimage.png");
-	//QPixmap pixmap5((QString)REC_PATH+(QString)"back2765.png");
+ 
+ 	/* The background palette breaks MessengerWindow in Linux...
+	 * so it is disabled until a solution is found.
+	 */
 
-	QBrush BackBrush(Backpixmap);
+#if 0
+  	QPixmap Backpixmap((QString)":/images/backgroundimage.png");
+
+	//QBrush BackBrush(Backpixmap);
 	QPalette BackPalette(BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush);
 	this->setPalette(BackPalette);                             //Set Background
+#endif
   
-  
-  /* Hide platform specific features */
-#ifdef Q_WS_WIN
-
-#endif
-}
+  /* Hide platform specific features */
+#ifdef Q_WS_WIN
+#endif
+}
 
 void MessengerWindow::messengertreeWidgetCostumPopupMenu( QPoint point )
 {