--- a/pkiutilities/CertSaver/data/CertSaver.rss	Tue Aug 31 16:04:40 2010 +0300
+++ b/pkiutilities/CertSaver/data/CertSaver.rss	Wed Sep 01 12:19:59 2010 +0100
@@ -22,9 +22,14 @@
 
 //  INCLUDES
 #include <eikon.rh>
+#include <eikon.rsg>
 #include <avkon.rsg>
+#include <avkon.hrh>
 #include <avkon.rh>
+#include <avkon.mbg>
+#include <avkon.loc>
 #include <appinfo.rh>
+#include <certmanui.loc>  //qtn_cm_not_valid_yet
 #include <certsaver.loc>
 #include "certsaver.hrh"
 
@@ -153,7 +158,6 @@
     buf = qtn_cm_not_defined;
     }
 
-
 //----------------------------------------------------
 //
 //    r_certsaver_softkeys_save_discard
@@ -205,6 +209,8 @@
         };
     }
 
+
+
 //----------------------------------------------------
 //
 //    r_message_query_dosave
@@ -276,28 +282,24 @@
 //
 //----------------------------------------------------
 //
-RESOURCE TBUF r_certsaver_warning_note { buf = qtn_httpsec_save_rootcertificate; }
-
-/*
-RESOURCE DIALOG r_certsaver_warning_note                 
-    {                                                    
-    flags = EGeneralQueryFlags;                          
-    buttons = r_certsaver_softkeys_save_discard;         
-    items=                                               
-        {                                                
-        DLG_LINE                                         
-            {                                            
-            type=EAknCtQuery;                            
-            id=EGeneralQuery;                            
-            control= AVKON_CONFIRMATION_QUERY            
-                {                                        
-                layout = EConfirmationLayout;            
+RESOURCE DIALOG r_certsaver_warning_note
+    {
+    flags = EGeneralQueryFlags;
+    buttons = r_certsaver_softkeys_save_discard;
+    items=
+        {
+        DLG_LINE
+            {
+            type=EAknCtQuery;
+            id=EGeneralQuery;
+            control= AVKON_CONFIRMATION_QUERY
+                {
+                layout = EConfirmationLayout;
                 label = qtn_httpsec_save_rootcertificate;
-                };                                       
-            }                                            
-        };                                               
-    }                                                    
-*/
+                };
+            }
+        };
+    }
 
 //-----------------------------------------------------------------------------
 //
@@ -470,7 +472,6 @@
 RESOURCE TBUF r_certsaver_one_private_key{ buf = qtn_cm_one_private_key; }
 RESOURCE TBUF r_certsaver_one_personal_certificate { buf = qtn_cm_one_personal_certificate; }
 RESOURCE TBUF r_certsaver_one_authority_certificate { buf = qtn_cm_one_authority_certificate; }
-RESOURCE TBUF r_certsaver_trustedsite_warning 
-                { buf = qtn_cm_save_trustedsite_certificate_warning_text; }
+RESOURCE TBUF r_certsaver_trustedsite_warning { buf = qtn_cm_save_trustedsite_certificate_warning_text; }
 
 // End of File