diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php
index 2cc08105d8..221332f5ea 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -103,7 +103,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "domain_uuid, ";
 				$sql .= "voicemail_message_uuid, ";
 				$sql .= "voicemail_uuid, ";
-				$sql .= "voicemail_uuid, ";
 				$sql .= "created_epoch, ";
 				$sql .= "read_epoch, ";
 				$sql .= "caller_id_name, ";
@@ -117,7 +116,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "'$domain_uuid', ";
 				$sql .= "'".uuid()."', ";
 				$sql .= "'$voicemail_uuid', ";
-				$sql .= "'$voicemail_uuid', ";
 				$sql .= "'$created_epoch', ";
 				$sql .= "'$read_epoch', ";
 				$sql .= "'$caller_id_name', ";
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index d1b563c502..a5f4fd3448 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -51,6 +51,7 @@ else {
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 		foreach ($result as &$row) {
 			$voicemail_id = $row["voicemail_id"];
+			$voicemail_uuid = $row["voicemail_uuid"];
 		}
 		unset ($prep_statement);
 	}
@@ -123,7 +124,20 @@ else {
 	$result_count = count($result);
 
 	//loop throug the voicemail messages
-	if ($result_count > 0) {
+	if ($result_count == 0) {
+		echo "<tr><td colspan='5' align='left'>\n";
+		echo "	<br /><br />\n";
+		echo "	<b>".$text['label-mailbox'].": ".$voicemail_id."</b>&nbsp;\n";
+		echo "	\n";
+		echo "</td>\n";
+		echo "<td valign='bottom' align='right'>\n";
+		echo "	<input type='button' class='btn' name='' alt='greetings' onclick=\"window.location='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$voicemail_id."'\" value='".$text['button-greetings']."'>\n";
+		echo "	<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='".PROJECT_PATH."/app/voicemails/voicemail_edit.php?id=".$voicemail_uuid."'\" value='".$text['button-settings']."'>\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+		echo $table_header;
+	}
+	else {
 		$previous_voicemail_id = '';
 		foreach($result as $row) {
 			if ($previous_voicemail_id != $row['voicemail_id']) {