diff --git a/encryptionconfigurationdialogimpl.cpp b/encryptionconfigurationdialogimpl.cpp
index 50a41cbb6..b8059027e 100644
--- a/encryptionconfigurationdialogimpl.cpp
+++ b/encryptionconfigurationdialogimpl.cpp
@@ -54,9 +54,18 @@ void EncryptionConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPl
     if( ! FULLTEST ) {
         askEachPartRB                 ->hide(); // We won't implement that.
         
+        encryptionSettingsBG          ->hide(); // Will implement that later.
+        
+        certificatePathCheckBG        ->hide(); // Will implement that later.
+        
+        crlBG                         ->hide(); // Will implement that later.
+        
         warnCRLExpireCB               ->hide(); // Will implement that later.
         warnCRLExpireSB               ->hide(); // Will implement that later.
         
+        warnReceiverCertificateExpiresCB->hide();//Will implement that later.
+        warnReceiverCertificateExpiresSB->hide();//Will implement that later.
+        
         warnChainCertificateExpiresCB ->hide(); // Will implement that later.
         warnChainCertificateExpiresSB ->hide(); // Will implement that later.
         warnReceiverNotInCertificateCB->hide(); // Will implement that later.
diff --git a/signatureconfigurationdialogimpl.cpp b/signatureconfigurationdialogimpl.cpp
index eda9d5b60..322654827 100644
--- a/signatureconfigurationdialogimpl.cpp
+++ b/signatureconfigurationdialogimpl.cpp
@@ -60,6 +60,12 @@ void SignatureConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPlu
     if( ! FULLTEST ){
         askEachPartRB                ->hide(); // We won't implement that.
         
+        sendCertificatesBG           ->hide(); // Will implement that later
+        
+        pinEntryBG                   ->hide(); // Will implement that later
+        
+        saveMessagesBG               ->hide(); // We won't implement that.
+        
         dontSendCertificatesRB       ->hide(); // Will implement that later.
         sendChainWithoutRootRB       ->hide(); // Will implement that later.
         sendChainWithRootRB          ->hide(); // Will implement that later.
@@ -70,8 +76,6 @@ void SignatureConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPlu
         warnRootCertificateExpiresSB ->hide(); // Will implement that later.
         warnAddressNotInCertificateCB->hide(); // Will implement that later.
         
-        sendSigOpaqueRB              ->hide(); // Will implement that later.
-        
         pinOncePerSessionRB          ->hide(); // Will implement that later.
         pinAddCertificatesRB         ->hide(); // Will implement that later.
         pinAlwaysWhenSigningRB       ->hide(); // Will implement that later.
@@ -79,7 +83,6 @@ void SignatureConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPlu
         pinIntervalSB                ->hide(); // Will implement that later.
         
         saveSentSigsCB               ->hide(); // We won't implement that.
-        saveMessagesBG               ->hide(); // We won't implement that.
     }
 }