--- a/pkiutilities/untrustedcertificatedialog/src/untrustedcertificatewidget.cpp	Fri Jun 11 14:28:40 2010 +0300
+++ b/pkiutilities/untrustedcertificatedialog/src/untrustedcertificatewidget.cpp	Thu Jun 24 12:46:20 2010 +0300
@@ -24,7 +24,6 @@
 #include <hbgroupbox.h>
 #include <hbtextedit.h>
 #include <QGraphicsLinearLayout>
-#include <QTextStream>
 
 const int KUnknownError = -5;           // KErrNotSupported
 
@@ -71,7 +70,7 @@
     mProblemDescription->setTextWrapping(Hb::TextWordWrap);
     mMainLayout->addItem(mProblemDescription);
 
-    if (mIsSavingServerNamePossible && mCertificateInfo->isPermanentAcceptAllowed()) {
+    if (isPermanentAcceptAllowed()) {
         Q_ASSERT(mAcceptPermanently == 0);
         // TODO: localised UI string needed
         mAcceptPermanently = new HbCheckBox(tr("Accept permanently"));
@@ -85,16 +84,12 @@
 
     Q_ASSERT(mCertificateDetailsText == 0);
     mCertificateDetailsText = new HbTextEdit;
-    QString certificateDetails;
-    QTextStream stream(&certificateDetails);
-    // TODO: localized UI string needed
-    stream << tr("Service:\n%1\n").arg(mServerName);
-    stream << endl;
-    stream << mCertificateInfo->certificateDetails();
+    QString certificateDetails = mCertificateInfo->certificateDetails(mServerName);
     mCertificateDetailsText->setPlainText(certificateDetails);
     mCertificateDetailsText->setReadOnly(true);
 
     mCertificateDetailsGroupBox->setContentWidget(mCertificateDetailsText);
+    mCertificateDetailsGroupBox->setCollapsed(true);
     mMainLayout->addItem(mCertificateDetailsGroupBox);
 
     setLayout(mMainLayout);
@@ -111,6 +106,16 @@
 }
 
 // ----------------------------------------------------------------------------
+// UntrustedCertificateWidget::isPermanentAcceptAllowed()
+// ----------------------------------------------------------------------------
+//
+bool UntrustedCertificateWidget::isPermanentAcceptAllowed() const
+{
+    return (mCertificateInfo->isDateValid() && (mServerName.length() > 0) &&
+        mIsSavingServerNamePossible);
+}
+
+// ----------------------------------------------------------------------------
 // UntrustedCertificateWidget::isPermanentAcceptChecked()
 // ----------------------------------------------------------------------------
 //
@@ -123,6 +128,15 @@
 }
 
 // ----------------------------------------------------------------------------
+// UntrustedCertificateWidget::serverName()
+// ----------------------------------------------------------------------------
+//
+QString UntrustedCertificateWidget::serverName() const
+{
+    return mServerName;
+}
+
+// ----------------------------------------------------------------------------
 // UntrustedCertificateWidget::processParameters()
 // ----------------------------------------------------------------------------
 //