--- a/bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp	Sat Apr 24 00:12:05 2010 +0300
+++ b/bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp	Sat Apr 24 00:30:17 2010 +0300
@@ -43,7 +43,7 @@
 #include "btui.h" 						// Global declarations
 #include "BTUIPairedDevicesView.h"
 #include "BTUIDeviceContainer.h"
-#include <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 #include <csxhelp/bt.hlp.hrh>   // Help IDs
 
 #include <gstabhelper.h>
@@ -1232,6 +1232,7 @@
        			// Showing a note in this case would always show a note with "%U" in it
        			// so the note is not shown at all
        			TRACE_INFO(_L("KErrAlreadyExists, but no device given, not showing a notification"))
+				CleanupStack::PopAndDestroy(&stringholder);
 	          	break;	
           		}
 
@@ -1724,7 +1725,7 @@
 			    TRACE_INFO(_L("Device status changed, update menupane"));
 			    iMenuDevice = device;
 			    iActiveMenuPane->Close();
-			    TRAP_IGNORE( this->ProcessCommandL(EAknSoftkeyOptions) );
+			    TRAP_IGNORE( this->ProcessCommandL(EAknSoftkeyContextOptions) );
 			    }
 		    }
 	    }