diff --git a/retroshare-gui/src/gui/ChatDialog.cpp b/retroshare-gui/src/gui/ChatDialog.cpp
index 5ea2dd46c..220f36634 100644
--- a/retroshare-gui/src/gui/ChatDialog.cpp
+++ b/retroshare-gui/src/gui/ChatDialog.cpp
@@ -65,7 +65,9 @@ ChatDialog::ChatDialog(QWidget *parent)
   connect(ui.textunderlineChatButton, SIGNAL(clicked()), this, SLOT(insertUnderline()));  
   connect(ui.textitalicChatButton, SIGNAL(clicked()), this, SLOT(insertItalic()));
 #endif
+  connect(ui.fontsButton, SIGNAL(clicked()), this, SLOT(setFont()));  
   
+  ui.fontsButton->setIcon(QIcon(QString(":/images/fonts.png")));
 
 //  connect(ui.msgSendList, SIGNAL(itemChanged( QTreeWidgetItem *, int ) ), 
 //  this, SLOT(toggleSendItem( QTreeWidgetItem *, int ) ));
@@ -380,3 +382,12 @@ void ChatDialog::insertAutour(QString leftTruc,QString rightTruc)
     //ui.lineEdit->setCursorPosition(p0 + leftTruc.size());
     
 }
+
+void ChatDialog::setFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, QFont(ui.lineEdit->toHtml()), this);
+    if (ok) {
+        ui.lineEdit->setFont(font);
+    }
+}
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/ChatDialog.h b/retroshare-gui/src/gui/ChatDialog.h
index 1b9d92d16..b3767ae98 100644
--- a/retroshare-gui/src/gui/ChatDialog.h
+++ b/retroshare-gui/src/gui/ChatDialog.h
@@ -64,6 +64,8 @@ void toggleSendItem( QTreeWidgetItem *item, int col );
   void insertStrike();
   void insertAutour(QString leftTruc,QString rightTruc);
   
+  void setFont();
+  
 
 private:
   
diff --git a/retroshare-gui/src/gui/ChatDialog.ui b/retroshare-gui/src/gui/ChatDialog.ui
index 480d911eb..b1f9f6f6d 100644
--- a/retroshare-gui/src/gui/ChatDialog.ui
+++ b/retroshare-gui/src/gui/ChatDialog.ui
@@ -892,7 +892,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="4" >
+       <item row="0" column="5" >
         <widget class="QPushButton" name="colorChatButton" >
          <property name="minimumSize" >
           <size>
@@ -911,6 +911,25 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="4" >
+        <widget class="QPushButton" name="fontsButton" >
+         <property name="minimumSize" >
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="maximumSize" >
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item row="1" column="0" >