diff --git a/fmapp/res/values/strings.xml b/fmapp/res/values/strings.xml
index b3b05c8..995ae04 100644
--- a/fmapp/res/values/strings.xml
+++ b/fmapp/res/values/strings.xml
@@ -261,6 +261,7 @@
     <string name="rt_plus_tags">Tags</string>
     <string name="enter_RxRePeatCount">Enter RxRePeat count</string>
     <string name="set_RxRePeatCount">Config RxRePeat count</string>
+    <string name="save_record_file">FM Recorded file saved to "<xliff:g id="record_file">%1$s</xliff:g>"</string>
 
     <string name="usr_def_band_min">Lower Freq Limit(In Mhz)</string>
     <string name="usr_def_band_max">Higher Freq Limit(In Mhz)</string>
diff --git a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
index 20f0262..d467162 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -983,6 +983,8 @@
        if (Environment.MEDIA_MOUNTED.equals(state)) {
           try {
                this.addToMediaDB(mSampleFile);
+               Toast.makeText(this,getString(R.string.save_record_file, mSampleFile.getAbsolutePath()),
+                          Toast.LENGTH_LONG).show();
           }
           catch(Exception e) {
                e.printStackTrace();
@@ -1131,7 +1133,7 @@
            boolean bTempSpeaker = mSpeakerPhoneOn; //need to restore SpeakerPhone
            boolean bTempMute = mMuted;// need to restore Mute status
            int bTempCall = mCallStatus;//need to restore call status
-           if (fmOff()) {
+           if (isFmOn() && fmOff()) {
                if((mServiceInUse) && (mCallbacks != null)) {
                    try {
                         mCallbacks.onDisabled();
@@ -1266,9 +1268,8 @@
                           stopFM();
                       }
                       if (mSpeakerPhoneOn) {
-                          mSpeakerPhoneOn = false;
                           if (isAnalogModeSupported())
-                              setAudioPath(true);
+                              setAudioPath(false);
                       }
                       mStoppedOnFocusLoss = true;
                       break;