diff --git a/kmmsgpartdlg.cpp b/kmmsgpartdlg.cpp
index 575cab9dd..96e876ec4 100644
--- a/kmmsgpartdlg.cpp
+++ b/kmmsgpartdlg.cpp
@@ -48,7 +48,7 @@ static const int numEncodingTypes =
   sizeof encodingTypes / sizeof *encodingTypes;
 
 KMMsgPartDialog::KMMsgPartDialog( const QString & caption,
-                                  QWidget * parent, const char * name )
+                                  QWidget * parent )
   : KDialog( parent )
 {
   setCaption( caption.isEmpty() ? i18n("Message Part Properties") : caption );
@@ -212,6 +212,7 @@ void KMMsgPartDialog::setMimeType( const QString & mimeType ) {
   for ( int i = 0 ; i < mMimeType->count() ; ++i )
     if ( mMimeType->itemText( i ) == mimeType ) {
       mMimeType->setCurrentIndex( i );
+      slotMimeTypeChanged( mimeType );
       return;
     }
   mMimeType->insertItem( 0, mimeType );
@@ -330,12 +331,11 @@ void KMMsgPartDialog::slotMimeTypeChanged( const QString & mimeType ) {
   }
 #endif
   // find a mimetype icon:
-  int dummy = 0;
-  QString tmp = mimeType; // get rid of const'ness
-  if ( mMimeType->validator() && mMimeType->validator()->validate( tmp, dummy )
-       == QValidator::Acceptable )
-    mIcon->setPixmap( KIconLoader::global()->loadMimeTypeIcon( KMimeType::mimeType( mimeType )->iconName(), K3Icon::Desktop ) );
-  else
+  KMimeType::Ptr mt = KMimeType::mimeType( mimeType );
+  if ( !mt.isNull() )
+    mIcon->setPixmap( KIconLoader::global()->loadMimeTypeIcon( mt->iconName(),
+                      K3Icon::Desktop ) );
+  else 
     mIcon->setPixmap( DesktopIcon("unknown") );
 }
 
@@ -444,7 +444,7 @@ void KMMsgPartDialogCompat::applyChanges()
   case QuotedPrintable: cte = "quoted-printable"; break;
   case Base64: default: cte = "base64";           break;
   }
-  if ( cte != mMsgPart->cteStr().lower() ) {
+  if ( cte != mMsgPart->cteStr().toLower() ) {
     QByteArray body = mMsgPart->bodyDecodedBinary();
     mMsgPart->setCteStr( cte );
     mMsgPart->setBodyEncodedBinary( body );
diff --git a/kmmsgpartdlg.h b/kmmsgpartdlg.h
index 4b41853fd..fcdff2c22 100644
--- a/kmmsgpartdlg.h
+++ b/kmmsgpartdlg.h
@@ -44,7 +44,7 @@ class KMMsgPartDialog: public KDialog
 
 public:
   KMMsgPartDialog( const QString & caption=QString(),
-		   QWidget * parent=0, const char * name=0 );
+		   QWidget * parent=0 );
   virtual ~KMMsgPartDialog();
 
   /** Get the currently selected mimetype */