From 87d47fe961127c60d329b1b23763c94cc518a3be Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Mon, 21 Jun 2021 16:16:47 -0600
Subject: [PATCH] create voicemail envelope information option (#5966)

* create voicemail envelope information option

* Update voicemail.xml
---
 .../functions/listen_to_recording.lua         |  9 +++++-
 .../switch/languages/ar/vm/voicemail.xml      | 31 ++++++++++---------
 .../switch/languages/de/vm/voicemail.xml      | 19 +++++++-----
 .../switch/languages/en/vm/voicemail.xml      | 17 +++++-----
 .../switch/languages/es/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/fr/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/he/vm/voicemail.xml      | 17 +++++-----
 .../switch/languages/it/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/nl/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/pt/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/ro/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/ru/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/sv/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/tr/vm/voicemail.xml      | 15 +++++----
 .../switch/languages/uk/vm/voicemail.xml      | 15 +++++----
 .../conf/languages/ar/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/de/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/en/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/es/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/fr/vm/voicemail.xml        | 17 +++++-----
 .../conf/languages/he/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/it/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/nl/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/pt/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/ro/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/ru/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/sv/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/tr/vm/voicemail.xml        | 15 +++++----
 .../conf/languages/uk/vm/voicemail.xml        | 15 +++++----
 29 files changed, 273 insertions(+), 182 deletions(-)

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 0b6b74fc26..718ed0700c 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
@@ -181,7 +181,7 @@
 		--post listen options
 			if (session:ready()) then
 				if (string.len(dtmf_digits) == 0) then
-					dtmf_digits = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "", "phrase:voicemail_listen_file_options:1:2:5:7:8:9:0", "", "^[\\d\\*#]$");
+					dtmf_digits = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", "phrase:voicemail_listen_file_options:1:2:3:5:7:8:9:0", "", "^[\\d\\*#]$");
 				end
 			end
 		--wait for more digits
@@ -197,6 +197,12 @@
 				elseif (dtmf_digits == "2") then
 					message_saved(voicemail_id, uuid);
 					session:execute("playback", "phrase:voicemail_ack:saved");
+				elseif (dtmf_digits == "3") then
+					session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-from.wav");
+					session:say(caller_id_number, default_language, "name_spelled", "iterated");
+					if (current_time_zone ~= nil) then
+						session:execute("set", "timezone="..current_time_zone.."");
+					end
 				elseif (dtmf_digits == "5") then
 					message_saved(voicemail_id, uuid);
 					return_call(caller_id_number);
@@ -207,6 +213,7 @@
 						if (voicemail_id_copy ~= voicemail_id  and voicemail_id_copy ~= nil) then
 							message_waiting(voicemail_id_copy, domain_uuid);
 						end
+					session:say(created_epoch, default_language, "current_date_time", "pronounced");
 				elseif (dtmf_digits == "8") then
 					forward_to_extension(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 a44695c05d..366d5aa17a 100644
--- a/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ar/vm/voicemail.xml
@@ -2,7 +2,7 @@
 
   <macro name="voicemail_enter_new_pass">
   	<input pattern="(.*)">
-      <match>
+  	  <match>
   	  	<action function="play-file" data="voicemail/vm-enter_new_pin.wav"/>
   	  </match>
   	</input>
@@ -10,7 +10,7 @@
 
   <macro name="voicemail_password_below_minimum">
   	<input pattern="(.*)">
-      <match>
+  	  <match>
   	  	<action function="play-file" data="voicemail/vm-pin_below_minimum_length.wav"/>
   	  	<action function="execute" data="sleep(300)"/>
   	  	<action function="play-file" data="voicemail/vm-minimum_pin_length_is.wav"/>
@@ -21,7 +21,7 @@
 
   <macro name="voicemail_password_not_secure">
   	<input pattern="(.*)">
-      <match>
+  	  <match>
   	  	<action function="play-file" data="voicemail/vm-password_is_not_secure.wav"/>
   	  </match>
   	</input>
@@ -38,9 +38,9 @@
     </input>
   </macro>
 
-  <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
+ <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+	<action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+	<action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -138,7 +141,7 @@
         <action function="execute" data="sleep(1000)"/>
         <action function="play-file" data="voicemail/vm-record_name2.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
    </input>
   </macro>
@@ -149,7 +152,7 @@
       <match>
         <action function="play-file" data="ivr/ivr-to_skip.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
    </input>
   </macro>
@@ -162,7 +165,7 @@
         <action function="execute" data="sleep(1000)"/>
         <action function="play-file" data="voicemail/vm-change_password.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
    </input>
   </macro>
@@ -173,9 +176,9 @@
       <match>
         <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
-       <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/de/vm/voicemail.xml b/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
index a44695c05d..f54d2fd471 100644
--- a/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/de/vm/voicemail.xml
@@ -37,10 +37,10 @@
       </match>
     </input>
   </macro>
-
-  <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
+  
+ <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/en/vm/voicemail.xml b/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
index a44695c05d..51b675b6e8 100644
--- a/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/en/vm/voicemail.xml
@@ -38,9 +38,9 @@
     </input>
   </macro>
 
-  <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
+ <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+	<action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+	<action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+	<action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+	<action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+	<action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/es/vm/voicemail.xml b/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/es/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml b/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/fr/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/he/vm/voicemail.xml b/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
index a44695c05d..fd21361e4a 100644
--- a/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/he/vm/voicemail.xml
@@ -37,10 +37,10 @@
       </match>
     </input>
   </macro>
-
+  
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/it/vm/voicemail.xml b/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/it/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml b/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/nl/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml b/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/pt/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml b/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ro/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml b/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/ru/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml b/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/sv/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml b/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/tr/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml b/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
+++ b/app/voicemails/resources/switch/languages/uk/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/ar/vm/voicemail.xml b/resources/templates/conf/languages/ar/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/ar/vm/voicemail.xml
+++ b/resources/templates/conf/languages/ar/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/de/vm/voicemail.xml b/resources/templates/conf/languages/de/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/de/vm/voicemail.xml
+++ b/resources/templates/conf/languages/de/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/en/vm/voicemail.xml b/resources/templates/conf/languages/en/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/en/vm/voicemail.xml
+++ b/resources/templates/conf/languages/en/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/es/vm/voicemail.xml b/resources/templates/conf/languages/es/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/es/vm/voicemail.xml
+++ b/resources/templates/conf/languages/es/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/fr/vm/voicemail.xml b/resources/templates/conf/languages/fr/vm/voicemail.xml
index a44695c05d..fd21361e4a 100644
--- a/resources/templates/conf/languages/fr/vm/voicemail.xml
+++ b/resources/templates/conf/languages/fr/vm/voicemail.xml
@@ -37,10 +37,10 @@
       </match>
     </input>
   </macro>
-
+  
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/he/vm/voicemail.xml b/resources/templates/conf/languages/he/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/he/vm/voicemail.xml
+++ b/resources/templates/conf/languages/he/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/it/vm/voicemail.xml b/resources/templates/conf/languages/it/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/it/vm/voicemail.xml
+++ b/resources/templates/conf/languages/it/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/nl/vm/voicemail.xml b/resources/templates/conf/languages/nl/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/nl/vm/voicemail.xml
+++ b/resources/templates/conf/languages/nl/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/pt/vm/voicemail.xml b/resources/templates/conf/languages/pt/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/pt/vm/voicemail.xml
+++ b/resources/templates/conf/languages/pt/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/ro/vm/voicemail.xml b/resources/templates/conf/languages/ro/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/ro/vm/voicemail.xml
+++ b/resources/templates/conf/languages/ro/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/ru/vm/voicemail.xml b/resources/templates/conf/languages/ru/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/ru/vm/voicemail.xml
+++ b/resources/templates/conf/languages/ru/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/sv/vm/voicemail.xml b/resources/templates/conf/languages/sv/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/sv/vm/voicemail.xml
+++ b/resources/templates/conf/languages/sv/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/tr/vm/voicemail.xml b/resources/templates/conf/languages/tr/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/tr/vm/voicemail.xml
+++ b/resources/templates/conf/languages/tr/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>
diff --git a/resources/templates/conf/languages/uk/vm/voicemail.xml b/resources/templates/conf/languages/uk/vm/voicemail.xml
index a44695c05d..8248ae596d 100644
--- a/resources/templates/conf/languages/uk/vm/voicemail.xml
+++ b/resources/templates/conf/languages/uk/vm/voicemail.xml
@@ -40,7 +40,7 @@
 
   <!-- similar to voicemail_listen_file_check in vm/sounds.xml, but maintains previous order -->
   <macro name="voicemail_listen_file_options">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
         <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
@@ -48,18 +48,21 @@
         <action function="play-file" data="voicemail/vm-save_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$2" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-message_envelope.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$3" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$4" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$5" method="pronounced" type="name_spelled"/>
-        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$7" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -178,4 +181,4 @@
    </input>
   </macro>
 
-</include>
\ No newline at end of file
+</include>