diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua
index 1912db47c3..a74b1c98db 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_to_extension.lua
@@ -29,9 +29,6 @@
 		--flush dtmf digits from the input buffer
 			session:flushDigits();
 
-		--save the voicemail message
-			message_saved(voicemail_id, uuid);
-
 		--request the forward_voicemail_id
 			if (session:ready()) then
 				dtmf_digits = '';
@@ -168,4 +165,16 @@
 		--send the email with the voicemail recording attached
 			send_email(forward_voicemail_id, voicemail_message_uuid);
 
+			session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-message_forwarded.wav");
+
+		--delete or save the message
+			local action = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", "phrase:voicemail_post_forward_action:1:2", "", "^[1-2]$");
+			if (action == "1") then
+				delete_recording(voicemail_id, uuid);
+				message_waiting(voicemail_id, domain_uuid);
+			else
+				message_saved(voicemail_id, uuid);
+				session:execute("playback", "phrase:voicemail_ack:saved");
+			end
+
 	end
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
index 0d9bfcc461..455a76ee28 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
@@ -193,7 +193,7 @@
 		--process the dtmf
 			if (session:ready()) then
 				if (dtmf_digits == "1") then
-					listen_to_recording(message_number, uuid, created_epoch, caller_id_name, caller_id_number, message_status);
+					return listen_to_recording(message_number, uuid, created_epoch, caller_id_name, caller_id_number, message_status);
 				elseif (dtmf_digits == "2") then
 					message_saved(voicemail_id, uuid);
 					session:execute("playback", "phrase:voicemail_ack:saved");
@@ -217,7 +217,6 @@
 				elseif (dtmf_digits == "8") then
 					forward_to_extension(voicemail_id, uuid);
 					dtmf_digits = '';
-					session:execute("playback", "phrase:voicemail_ack:saved");
 				elseif (dtmf_digits == "9") then
 					send_email(voicemail_id, uuid);
 					dtmf_digits = '';
diff --git a/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml b/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml
index 366d5aa17a..c493e49d33 100644
--- a/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/de/vm/voicemail.xml b/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
index f54d2fd471..785e5935d4 100644
--- a/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/en/vm/voicemail.xml b/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
index 51b675b6e8..c110994d86 100644
--- a/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/es/vm/voicemail.xml b/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml b/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/he/vm/voicemail.xml b/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
index fd21361e4a..12f618ad1f 100644
--- a/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/it/vm/voicemail.xml b/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml b/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml b/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml b/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml b/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml b/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml b/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>
diff --git a/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml b/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
index 8248ae596d..e9001e7f26 100644
--- a/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
@@ -181,4 +181,17 @@
    </input>
   </macro>
 
+  <macro name="voicemail_post_forward_action">
+    <input pattern="^(1):(2)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-delete_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_message.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
 </include>