--- a/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h	Tue Jul 27 13:42:03 2010 +0300
+++ b/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h	Fri Aug 06 16:43:21 2010 +0300
@@ -133,10 +133,11 @@
     MATExtObserver& iObserver;
     
     RATExt iATExtClient;
-    TBuf8<KDefaultCmdBufLength> iCmdBuffer;
-    TBuf8<KDefaultCmdBufLength> iRecvBuffer;
-    TBuf8<KDefaultCmdBufLength> iReplyBuffer;
-    TBuf8<512> iSystemReply;
+    // reserve buffers from the heap
+    RBuf8 iCmdBuffer;
+    RBuf8 iSystemReply;
+    TBuf8<KDefaultCmdBufLength> *iRecvBuffer;
+    TBuf8<KDefaultCmdBufLength> *iReplyBuffer;
     
     TInt iRemainingReplyLength;
     TPckg<TInt> iRemainingReplyLengthPckg;