diff --git a/accountdialog.cpp b/accountdialog.cpp
index 82ef824bd..368a35e06 100644
--- a/accountdialog.cpp
+++ b/accountdialog.cpp
@@ -215,7 +215,8 @@ void AccountDialog::makePopAccountPage()
   topLayout->addWidget( mPop.portEdit, 6, 1 ); 
 
   mPop.useSSLCheck =
-    new QCheckBox( i18n("Use SSL for secure mail download"), page);
+    new QCheckBox( i18n("Use SSL for secure mail download") + " " +
+      i18n("(experimental)"), page);
   topLayout->addMultiCellWidget( mPop.useSSLCheck, 7, 7, 0, 1);
   connect(mPop.useSSLCheck, SIGNAL(clicked()), this, SLOT(slotSSLChanged()));
 
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 985283f0c..17aa77e1a 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -1547,7 +1547,7 @@ void KMComposeWin::slotInsertMyPublicKey()
   {
     kernel->kbp()->idle();
     KMessageBox::sorry( 0L, i18n("Couldn't get your public key for\n%1.")
-      .arg(from()) );
+      .arg(Kpgp::getKpgp()->user()) );
     return;
   }