Index: gpgkeyselect.cpp
===================================================================
--- gpgkeyselect.cpp	(revision 4770)
+++ gpgkeyselect.cpp	(working copy)
@@ -49,14 +49,14 @@
   ICQUser *u = gUserManager.FetchUser( szId, nPPID, LOCK_R );
   if ( !u ) return;
 
-  setCaption( tr("Select GPG Key for user %1").arg(QString::fromLocal8Bit(u->GetAlias())) );
+  setCaption( tr("Select GPG Key for user %1").arg(QString::fromUtf8(u->GetAlias())) );
 
   this->szId = strdup( szId );
   this->nPPID = nPPID;
 
   QBoxLayout* top_lay = new QVBoxLayout(this, 11, 6);
   
-  top_lay->addWidget( new QLabel( tr("Select a GPG key for user %1.").arg(QString::fromLocal8Bit(u->GetAlias())), this ) );
+  top_lay->addWidget( new QLabel( tr("Select a GPG key for user %1.").arg(QString::fromUtf8(u->GetAlias())), this ) );
   if ( strcmp( u->GPGKey(), "" )==0 )
     top_lay->addWidget( new QLabel( tr("Current key: No key selected"), this ) );
   else
Index: awaymsgdlg.cpp
===================================================================
--- awaymsgdlg.cpp	(revision 4770)
+++ awaymsgdlg.cpp	(working copy)
@@ -153,7 +153,7 @@
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
   if (o == 0) return;
   setCaption(QString(tr("Set %1 Response for %2"))
-             .arg(ICQUser::StatusToStatusStr(m_nStatus, false)).arg(QString::fromLocal8Bit(o->GetAlias())));
+             .arg(ICQUser::StatusToStatusStr(m_nStatus, false)).arg(QString::fromUtf8(o->GetAlias())));
   QTextCodec *codec = UserCodec::defaultEncoding();
   if (*o->AutoResponse())
     mleAwayMsg->setText(codec->toUnicode(o->AutoResponse()));
Index: mainwin.cpp
===================================================================
--- mainwin.cpp	(revision 4770)
+++ mainwin.cpp	(working copy)
@@ -3660,7 +3660,7 @@
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
   
   // We might have no owner
-  QString m_Alias = (o == 0) ? QString(tr("(Error! No owner set)")) : QString::fromLocal8Bit(o->GetAlias());
+  QString m_Alias = (o == 0) ? QString(tr("(Error! No owner set)")) : QString::fromUtf8(o->GetAlias());
   unsigned long m_Uin = (o == 0) ? 0 : o->Uin();
   
   QString about(tr("Licq version %1%8.\n"
Index: gpgkeymanager.cpp
===================================================================
--- gpgkeymanager.cpp	(revision 4770)
+++ gpgkeymanager.cpp	(working copy)
@@ -161,7 +161,7 @@
   list.sort();
   
   for ( unsigned int i=0; i<list.count(); i++ )
-  popupMenu.insertItem( list.at(i)->alias, i );
+  popupMenu.insertItem( QString::fromUtf8(list.at(i)->alias), i );
 
   int res = popupMenu.exec(QCursor::pos());
   if ( res<0 ) return;
@@ -308,7 +308,7 @@
 
 void KeyListItem::updateText( ICQUser *u )
 {
-  setText( 0, u->GetAlias() );
+  setText( 0, QString::fromUtf8(u->GetAlias()) );
   setText( 1, u->UseGPG() ? tr("Yes") : tr("No") );
   setText( 2, u->GPGKey() );
 }
