diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php
index a03c5c6838..63763f240b 100644
--- a/app/voicemail_greetings/app_languages.php
+++ b/app/voicemail_greetings/app_languages.php
@@ -351,6 +351,33 @@ $text['label-pause']['zh-cn'] = "暂停";
 $text['label-pause']['ja-jp'] = "一時停止";
 $text['label-pause']['ko-kr'] = "정지시키다";
 
+$text['label-preview']['en-us'] = "Preview";
+$text['label-preview']['en-gb'] = "Preview";
+$text['label-preview']['ar-eg'] = "معاينة";
+$text['label-preview']['de-at'] = "Vorschau";
+$text['label-preview']['de-ch'] = "Vorschau";
+$text['label-preview']['de-de'] = "Vorschau";
+$text['label-preview']['el-gr'] = "Πρεμιέρα";
+$text['label-preview']['es-cl'] = "Avance";
+$text['label-preview']['es-mx'] = "Avance";
+$text['label-preview']['fr-ca'] = "Avance";
+$text['label-preview']['fr-fr'] = "Avance";
+$text['label-preview']['he-il'] = "תצוגה מקדימה";
+$text['label-preview']['it-it'] = "Anteprima";
+$text['label-preview']['ka-ge'] = "გადახედვა";
+$text['label-preview']['nl-nl'] = "Voorbeeld";
+$text['label-preview']['pl-pl'] = "Zapowiedź";
+$text['label-preview']['pt-br'] = "Pré-visualização";
+$text['label-preview']['pt-pt'] = "Pré-visualização";
+$text['label-preview']['ro-ro'] = "Previzualizare";
+$text['label-preview']['ru-ru'] = "Предварительный просмотр";
+$text['label-preview']['sv-se'] = "Förhandsvisning";
+$text['label-preview']['uk-ua'] = "Попередній перегляд";
+$text['label-preview']['tr-tr'] = "Önizleme";
+$text['label-preview']['zh-cn'] = "预览";
+$text['label-preview']['ja-jp'] = "プレビュー";
+$text['label-preview']['ko-kr'] = "시사";
+
 $text['label-greeting']['en-us'] = "Greeting";
 $text['label-greeting']['en-gb'] = "Greeting";
 $text['label-greeting']['ar-eg'] = "تحية";
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 0f1bd988a7..616242e109 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -286,6 +286,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 		if (is_array($row) && @sizeof($row) != 0) {
 			$greeting_id = $row["greeting_id"];
 			$greeting_name = $row["greeting_name"];
+			$greeting_filename = $row['greeting_filename'];
 			$greeting_voice = $row["greeting_voice"];
 			$greeting_message = $row["greeting_message"];
 			$greeting_description = $row["greeting_description"];
@@ -307,11 +308,22 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['label-'.($action == 'update' ? 'edit' : 'add')]."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','style'=>'margin-right: 15px;','collapse'=>'hide-xs','link'=>'voicemail_greetings.php?id='.urlencode($voicemail_id)]);
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$settings->get('theme', 'button_icon_back'),'id'=>'btn_back','collapse'=>'hide-xs','link'=>'voicemail_greetings.php?id='.urlencode($voicemail_id)]);
  	if (permission_exists('voicemail_greeting_delete') && $action == 'update') {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'name'=>'btn_delete','collapse'=>'hide-xs','style'=>'margin-right: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'name'=>'btn_delete','collapse'=>'hide-xs','style'=>'margin-left: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
-	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save'),'id'=>'btn_save','collapse'=>'hide-xs']);
+	if (permission_exists('voicemail_greeting_play') && !empty($voicemail_greeting_uuid) && is_uuid($voicemail_greeting_uuid)) {
+		$greeting_file_name = strtolower(pathinfo($greeting_filename, PATHINFO_BASENAME));
+		$greeting_file_ext = pathinfo($greeting_file_name, PATHINFO_EXTENSION);
+		switch ($greeting_file_ext) {
+			case "wav" : $greeting_type = "audio/wav"; break;
+			case "mp3" : $greeting_type = "audio/mpeg"; break;
+			case "ogg" : $greeting_type = "audio/ogg"; break;
+		}
+		echo "<audio id='recording_audio_".escape($voicemail_greeting_uuid)."' style='display: none;' preload='none' onended=\"recording_reset('".escape($voicemail_greeting_uuid)."');\" src=\"".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?a=download&type=rec&t=bin&id=".urlencode($voicemail_id)."&uuid=".urlencode($voicemail_greeting_uuid)."\" type='".$greeting_type."'></audio>";
+		echo button::create(['type'=>'button','title'=>$text['label-play'].' / '.$text['label-pause'],'label'=>$text['label-preview'],'icon'=>$settings->get('theme','button_icon_play'),'id'=>'recording_button_'.escape($voicemail_greeting_uuid),'onclick'=>"recording_play('".escape($voicemail_greeting_uuid)."','','','".$text['label-preview']."'); this.blur();"]);
+	}
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$settings->get('theme', 'button_icon_save'),'id'=>'btn_save','style'=>'margin-left: 15px;','collapse'=>'hide-xs']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";