--- a/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h	Wed Sep 15 12:23:51 2010 +0300
+++ b/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h	Wed Oct 13 14:43:49 2010 +0300
@@ -133,11 +133,10 @@
     MATExtObserver& iObserver;
     
     RATExt iATExtClient;
-    // reserve buffers from the heap
-    RBuf8 iCmdBuffer;
-    RBuf8 iSystemReply;
-    TBuf8<KDefaultCmdBufLength> *iRecvBuffer;
-    TBuf8<KDefaultCmdBufLength> *iReplyBuffer;
+    TBuf8<KDefaultCmdBufLength> iCmdBuffer;
+    TBuf8<KDefaultCmdBufLength> iRecvBuffer;
+    TBuf8<KDefaultCmdBufLength> iReplyBuffer;
+    TBuf8<512> iSystemReply;
     
     TInt iRemainingReplyLength;
     TPckg<TInt> iRemainingReplyLengthPckg;