--- a/javamanager/javabackup/midp2backup/src.s60/javastoragebackuputil.cpp	Fri Jun 11 13:33:44 2010 +0300
+++ b/javamanager/javabackup/midp2backup/src.s60/javastoragebackuputil.cpp	Tue Jul 06 20:36:19 2010 +0300
@@ -19,6 +19,7 @@
 #include "javastoragebackuputil.h"
 #include "midp2backupplugin.h"
 #include "midp2backupdataids.h"
+#include "mediaidupdater.h"
 
 #include "javastorageentry.h"
 #include "javastorage.h"
@@ -171,6 +172,10 @@
             User::Leave(KErrGeneral);
         }
 
+        // ensure that storage contains correct removable media ids
+        MediaIdUpdater updater;
+        updater.update();
+
         // Storage restore is over; Set state to EAppArc
         aRestoreState = EAppArc;
         aBufferSpaceLeft = iBufferSpaceLeft;
@@ -881,6 +886,9 @@
 
             attribute.setEntry(ON_SCREEN_KEYPAD, iStringVector[count++]);
             insertEntry.insert(attribute);
+            
+            attribute.setEntry(SECURITY_WARNINGS, iStringVector[count++]);
+            insertEntry.insert(attribute);
 
             try
             {
@@ -1620,6 +1628,16 @@
             str = (*findIterator).entryValue();
         }
         iStringVector.push_back(str);
+        
+        attribute.setEntry(SECURITY_WARNINGS, L"");
+        str = emptyString;
+        findIterator = (*applications).find(attribute);
+
+        if (findIterator != (*applications).end())
+        {
+            str = (*findIterator).entryValue();
+        }
+        iStringVector.push_back(str);
 
         rowsCount++;
     }