--- a/camerauis/cameraapp/generic/src/CamPostCaptureViewBase.cpp	Thu Jul 15 18:18:07 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPostCaptureViewBase.cpp	Thu Aug 19 09:36:57 2010 +0300
@@ -217,6 +217,8 @@
             break;
         case KAiwCmdEdit:
         case ECamCmdEdit:
+        case ECamCmdEditPhoto:
+        case ECamCmdEditVideo:    
             {
             CAiwGenericParamList& inputParams = iAiwServiceHandler->InParamListL();
             TPtrC currentFullFileName(iController.CurrentFullFileName());
@@ -582,7 +584,8 @@
                 {
                 fixedToolbar->SetToolbarObserver( this );
                 UpdateToolbarIconsL();
-                if( Id().iUid != ECamViewIdVideoPostCapture && !appui->IsSelfTimedCapture() )
+                if( Id().iUid != ECamViewIdVideoPostCapture && !appui->IsSelfTimedCapture() && 
+                    !iController.SavedCurrentImage() )
                     {
                     fixedToolbar->SetDimmed(ETrue);
                     }