diff --git a/plugins/autoreplace/autoreplacepreferences.cpp b/plugins/autoreplace/autoreplacepreferences.cpp
index dab6645f0..0ab72097e 100644
--- a/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/plugins/autoreplace/autoreplacepreferences.cpp
@@ -1,228 +1,235 @@
 /***************************************************************************
                           autoreplacepreferences.cpp  -  description
                              -------------------
     begin                : 20030426
     copyright            : (C) 2003 by Roberto Pariset
     email                : victorheremita@fastwebnet.it
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #define QT3_SUPPORT
 
 #include "autoreplacepreferences.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <q3header.h>
-#include <q3listview.h>
+#include <QTreeWidget>
 
 #include <klocale.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
 
 #include "ui_autoreplaceprefs.h"
 #include "autoreplaceconfig.h"
 
 K_PLUGIN_FACTORY(AutoReplacePreferencesFactory, registerPlugin<AutoReplacePreferences>();)
 K_EXPORT_PLUGIN(AutoReplacePreferencesFactory( "kcm_kopete_autoreplace" ))
 
 
 // TODO: Use KConfigXT
 AutoReplacePreferences::AutoReplacePreferences( QWidget *parent, const QVariantList &args )
 : KCModule( AutoReplacePreferencesFactory::componentData(), parent, args )
 {
+	QStringList headerList = (QStringList() << i18n("Text") << i18n("Replacement"));
 	QVBoxLayout* l = new QVBoxLayout( this );
 	QWidget* w = new QWidget;
 	preferencesDialog = new Ui::AutoReplacePrefsUI;
 	preferencesDialog->setupUi( w );
 	l->addWidget( w );
 
 	// creates table columns (avoids new columns every time)
-	preferencesDialog->m_list->addColumn( i18n("Text" ) );
-	preferencesDialog->m_list->addColumn( i18n("Replacement" ) );
-	preferencesDialog->m_list->header()->setStretchEnabled( true , 1 );
+	preferencesDialog->m_list->setColumnCount(2);
+	preferencesDialog->m_list->setHeaderLabels(headerList);
+	preferencesDialog->m_list->header()->setResizeMode(QHeaderView::Stretch);
+	preferencesDialog->m_list->setSelectionMode(QAbstractItemView::SingleSelection);
+	preferencesDialog->m_list->header()->setSortIndicatorShown(true);
 	
 	// connect SIGNALS/SLOTS
 	connect( preferencesDialog->m_add, SIGNAL(pressed()),
 		SLOT(slotAddCouple()) );
 	connect( preferencesDialog->m_edit, SIGNAL(pressed()),
 		SLOT(slotEditCouple()) );
 	connect( preferencesDialog->m_remove, SIGNAL(pressed()),
 		SLOT(slotRemoveCouple()) );
 	connect( preferencesDialog->m_list, SIGNAL(selectionChanged()),
 		SLOT(slotSelectionChanged()) );
 	connect( preferencesDialog->m_key, SIGNAL(textChanged(QString)),
 		SLOT(slotEnableAddEdit(QString)) ); 
 
 	connect( preferencesDialog->AutoReplaceIncoming, SIGNAL(toggled(bool)),
 		SLOT(slotWidgetModified()) ); 
 	connect( preferencesDialog->AutoReplaceOutgoing, SIGNAL(toggled(bool)),
 		SLOT(slotWidgetModified()) ); 
 	connect( preferencesDialog->DotEndSentence, SIGNAL(toggled(bool)),
 		SLOT(slotWidgetModified()) ); 
 	connect( preferencesDialog->CapitalizeBeginningSentence, SIGNAL(toggled(bool)),
 		SLOT(slotWidgetModified()) ); 
 
 	//setMainWidget( preferencesDialog->gb_options, "AutoReplace Plugin" );
 
 	m_config = new AutoReplaceConfig;
 }
 
 AutoReplacePreferences::~AutoReplacePreferences()
 {
 	delete m_config;
 	delete preferencesDialog;
 }
 
 // reload configuration reading it from kopeterc
 void AutoReplacePreferences::load()
 {
 	m_config->load();
 
 	// Removes and deletes all the items in this list view and triggers an update
 	preferencesDialog->m_list->clear();
 
 	// show keys/values on gui
 	AutoReplaceConfig::WordsToReplace::Iterator it;
 	AutoReplaceConfig::WordsToReplace map = m_config->map();
 	for ( it = map.begin(); it != map.end(); ++it )
 	{
+		QStringList args = (QStringList() << it.key() << it.value());
 		// notice: insertItem is called automatically by the constructor
-		new Q3ListViewItem( preferencesDialog->m_list, it.key(), it.value() );
+		new QTreeWidgetItem( preferencesDialog->m_list, args );
 	}
 
 	preferencesDialog->AutoReplaceIncoming->setChecked(m_config->autoReplaceIncoming());
 	preferencesDialog->AutoReplaceOutgoing->setChecked(m_config->autoReplaceOutgoing());
 	preferencesDialog->DotEndSentence->setChecked(m_config->dotEndSentence());
 	preferencesDialog->CapitalizeBeginningSentence->setChecked(m_config->capitalizeBeginningSentence());
 }
 
 // save list to kopeterc and creates map out of it
 void AutoReplacePreferences::save()
 {
 	// make a list reading all values from gui
 	AutoReplaceConfig::WordsToReplace newWords;
-	for ( Q3ListViewItem * i = preferencesDialog->m_list->firstChild(); i != 0; i = i->nextSibling() )
-		newWords[ i->text( 0 ) ] = i->text( 1 );
-
+	for (int i = 0; i < preferencesDialog->m_list->topLevelItemCount(); ++i) {
+		QTreeWidgetItem *item = preferencesDialog->m_list->topLevelItem(i);
+		newWords[item->text(0)] = item->text(1);
+	}
 	// save the words list
 	m_config->setMap( newWords );
 
 	m_config->setAutoReplaceIncoming(preferencesDialog->AutoReplaceIncoming->isChecked());
 	m_config->setAutoReplaceOutgoing(preferencesDialog->AutoReplaceOutgoing->isChecked());
 	m_config->setDotEndSentence(preferencesDialog->DotEndSentence->isChecked());
 	m_config->setCapitalizeBeginningSentence(preferencesDialog->CapitalizeBeginningSentence->isChecked());
 
 	m_config->save();
 }
 
 // read m_key m_value, create a QListViewItem
 void AutoReplacePreferences::slotAddCouple()
 {
 	QString k = preferencesDialog->m_key->text();
 	QString v = preferencesDialog->m_value->text();
+	QStringList args = (QStringList() << k << v);
 	if ( !k.isEmpty() && !k.isNull() && !v.isEmpty() && !v.isNull() )
 	{
-		Q3ListViewItem * lvi;
-		Q3ListViewItem * oldLvi = 0;
+		QTreeWidgetItem * lvi;
+		QTreeWidgetItem * oldLvi = 0;
 		// see if we are replacing an existing entry
-		oldLvi = preferencesDialog->m_list->findItem( k, 0 );
+		QList<QTreeWidgetItem *> oldLvi_List = preferencesDialog->m_list->findItems( k, Qt::MatchExactly, 0 );
+		oldLvi = oldLvi_List.first();		//SelectionMode::SingleSelection
                 delete oldLvi;
-		lvi = new Q3ListViewItem( preferencesDialog->m_list, k, v );
+		lvi = new QTreeWidgetItem( preferencesDialog->m_list, args );
 		// Triggers a size, geometry and content update
 		// during the next iteration of the event loop
-		preferencesDialog->m_list->triggerUpdate();
+		preferencesDialog->m_list->update();
 		// select last added
-		preferencesDialog->m_list->setSelected( lvi, true );
+		lvi->setSelected(true);
 	}
 
 	slotWidgetModified();
 }
 
 // edit the selected item
 void AutoReplacePreferences::slotEditCouple()
 {
 	const QString k = preferencesDialog->m_key->text();
 	const QString v = preferencesDialog->m_value->text();
-	Q3ListViewItem * lvi;
-	if ( ( lvi = preferencesDialog->m_list->selectedItem() ) && !k.isEmpty() && !k.isNull() && !v.isEmpty() && !v.isNull() )
+	QTreeWidgetItem * lvi;
+	if ( ( lvi = preferencesDialog->m_list->currentItem() ) && !k.isEmpty() && !k.isNull() && !v.isEmpty() && !v.isNull() )
 	{
 		lvi->setText( 0, k );
 		lvi->setText( 1, v );
-		preferencesDialog->m_list->triggerUpdate();
+		preferencesDialog->m_list->update();
 		slotWidgetModified();
 	}
 }
 
 // Returns a pointer to the selected item if the list view is in
 // Single selection mode and an item is selected
 void AutoReplacePreferences::slotRemoveCouple()
 {
-	delete preferencesDialog->m_list->selectedItem();
+	delete preferencesDialog->m_list->currentItem();
 
 	slotWidgetModified();
 }
 
 void AutoReplacePreferences::slotEnableAddEdit( const QString & keyText )
 {
 	preferencesDialog->m_add->setEnabled( !keyText.isEmpty() );
-	preferencesDialog->m_edit->setEnabled( !keyText.isEmpty() && preferencesDialog->m_list->selectedItem() );
+	preferencesDialog->m_edit->setEnabled( !keyText.isEmpty() && preferencesDialog->m_list->currentItem() );
 }
 
 void AutoReplacePreferences::slotSelectionChanged()
 {
-	Q3ListViewItem *selection = 0;
-	if ( ( selection = preferencesDialog->m_list->selectedItem() ) )
+	QTreeWidgetItem *selection = 0;
+	if ( ( selection = preferencesDialog->m_list->currentItem() ) )
 	{
 		// enable the remove button
 		preferencesDialog->m_remove->setEnabled( true );
 		// put the selection contents into the text entry widgets so they can be edited
 		preferencesDialog->m_key->setText( selection->text( 0 ) );
 		preferencesDialog->m_value->setText( selection->text( 1 ) );
 	}
 	else
 	{
 		preferencesDialog->m_remove->setEnabled( false );
 		preferencesDialog->m_key->clear();
 		preferencesDialog->m_value->clear();
 	}
 }
 
 void AutoReplacePreferences::slotWidgetModified()
 {
 	emit KCModule::changed( true );
 }
 
 void AutoReplacePreferences::defaults()
 {
     preferencesDialog->m_list->clear();
     m_config->loadDefaultAutoReplaceList();
     AutoReplaceConfig::WordsToReplace::Iterator it;
     AutoReplaceConfig::WordsToReplace map = m_config->map();
     for ( it = map.begin(); it != map.end(); ++it )
     {
+        QStringList args = (QStringList() << it.key() << it.value());
         // notice: insertItem is called automatically by the constructor
-        new Q3ListViewItem( preferencesDialog->m_list, it.key(), it.value() );
+        new QTreeWidgetItem( preferencesDialog->m_list, args );
     }
 
 	preferencesDialog->AutoReplaceIncoming->setChecked(false);
 	preferencesDialog->AutoReplaceOutgoing->setChecked(true);
 	preferencesDialog->DotEndSentence->setChecked(false);
 	preferencesDialog->CapitalizeBeginningSentence->setChecked(false);
 
     slotWidgetModified();
 }
 
 #include "autoreplacepreferences.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
 
diff --git a/plugins/autoreplace/autoreplaceprefs.ui b/plugins/autoreplace/autoreplaceprefs.ui
index 034013d41..9b15a39d4 100644
--- a/plugins/autoreplace/autoreplaceprefs.ui
+++ b/plugins/autoreplace/autoreplaceprefs.ui
@@ -1,281 +1,268 @@
 <ui version="4.0" >
  <author>Roberto Pariset</author>
  <class>AutoReplacePrefsUI</class>
  <widget class="QWidget" name="AutoReplacePrefsUI" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>381</width>
     <height>431</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <property name="spacing" >
     <number>6</number>
    </property>
    <property name="leftMargin" >
     <number>0</number>
    </property>
    <property name="topMargin" >
     <number>0</number>
    </property>
    <property name="rightMargin" >
     <number>0</number>
    </property>
    <property name="bottomMargin" >
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Sentence Options</string>
      </property>
      <layout class="QVBoxLayout" >
       <property name="spacing" >
        <number>6</number>
       </property>
       <property name="leftMargin" >
        <number>9</number>
       </property>
       <property name="topMargin" >
        <number>9</number>
       </property>
       <property name="rightMargin" >
        <number>9</number>
       </property>
       <property name="bottomMargin" >
        <number>9</number>
       </property>
       <item>
        <widget class="QCheckBox" name="DotEndSentence" >
         <property name="text" >
          <string>Add a dot at the end of each sent line</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="CapitalizeBeginningSentence" >
         <property name="text" >
          <string>Start each sent line with a capital letter</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>Replacements List</string>
      </property>
      <layout class="QGridLayout" >
       <property name="leftMargin" >
        <number>9</number>
       </property>
       <property name="topMargin" >
        <number>9</number>
       </property>
       <property name="rightMargin" >
        <number>9</number>
       </property>
       <property name="bottomMargin" >
        <number>9</number>
       </property>
       <property name="horizontalSpacing" >
        <number>6</number>
       </property>
       <property name="verticalSpacing" >
        <number>6</number>
       </property>
       <item row="1" column="0" >
-       <widget class="Q3ListView" name="m_list" >
-        <property name="selectionMode" >
-         <enum>Q3ListView::Single</enum>
-        </property>
+       <widget class="QTreeWidget" name="m_list" >
         <property name="allColumnsShowFocus" >
          <bool>true</bool>
         </property>
-        <property name="showSortIndicator" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
       <item row="1" column="1" >
        <layout class="QVBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
         <property name="leftMargin" >
          <number>0</number>
         </property>
         <property name="topMargin" >
          <number>0</number>
         </property>
         <property name="rightMargin" >
          <number>0</number>
         </property>
         <property name="bottomMargin" >
          <number>0</number>
         </property>
         <item>
          <widget class="QPushButton" name="m_add" >
           <property name="enabled" >
            <bool>true</bool>
           </property>
           <property name="text" >
            <string>&amp;Add</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="m_edit" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
           <property name="text" >
            <string>&amp;Edit</string>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
           <property name="orientation" >
            <enum>Qt::Vertical</enum>
           </property>
           <property name="sizeType" >
            <enum>QSizePolicy::Expanding</enum>
           </property>
           <property name="sizeHint" >
            <size>
             <width>20</width>
             <height>40</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QPushButton" name="m_remove" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
           <property name="text" >
            <string>&amp;Remove</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="0" column="0" colspan="2" >
        <layout class="QHBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
         <property name="leftMargin" >
          <number>0</number>
         </property>
         <property name="topMargin" >
          <number>0</number>
         </property>
         <property name="rightMargin" >
          <number>0</number>
         </property>
         <property name="bottomMargin" >
          <number>0</number>
         </property>
         <item>
          <widget class="QLabel" name="textLabel1" >
           <property name="text" >
            <string>&amp;Text:</string>
           </property>
           <property name="buddy" >
            <cstring>m_key</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="m_key" />
         </item>
         <item>
          <widget class="QLabel" name="textLabel2" >
           <property name="text" >
            <string>Re&amp;placement:</string>
           </property>
           <property name="buddy" >
            <cstring>m_value</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="m_value" />
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="gb_options" >
      <property name="title" >
       <string>Replacement Options</string>
      </property>
      <layout class="QVBoxLayout" >
       <property name="spacing" >
        <number>6</number>
       </property>
       <property name="leftMargin" >
        <number>9</number>
       </property>
       <property name="topMargin" >
        <number>9</number>
       </property>
       <property name="rightMargin" >
        <number>9</number>
       </property>
       <property name="bottomMargin" >
        <number>9</number>
       </property>
       <item>
        <widget class="QCheckBox" name="AutoReplaceIncoming" >
         <property name="text" >
          <string>Auto replace on incoming messages</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="AutoReplaceOutgoing" >
         <property name="text" >
          <string>Auto replace on outgoing messages</string>
         </property>
         <property name="checked" >
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
-  <customwidgets>
-  <customwidget>
-   <class>Q3ListView</class>
-   <extends>Q3Frame</extends>
-   <header>q3listview.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>DotEndSentence</tabstop>
   <tabstop>CapitalizeBeginningSentence</tabstop>
   <tabstop>m_key</tabstop>
   <tabstop>m_value</tabstop>
   <tabstop>m_list</tabstop>
   <tabstop>m_add</tabstop>
   <tabstop>m_edit</tabstop>
   <tabstop>m_remove</tabstop>
   <tabstop>AutoReplaceIncoming</tabstop>
   <tabstop>AutoReplaceOutgoing</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>