diff --git a/debian/patches/sipwise_fix_app_voicemail_bugs.patch b/debian/patches/sipwise_fix_app_voicemail_bugs.patch
index 9a19e2a..049979b 100644
--- a/debian/patches/sipwise_fix_app_voicemail_bugs.patch
+++ b/debian/patches/sipwise_fix_app_voicemail_bugs.patch
@@ -7,7 +7,7 @@ Subject: sipwise_fix_app_voicemail_bugs
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 1c36c7e..97359f8 100644
+index 312be2a..df175fe 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -1326,7 +1326,7 @@ static int findreplen(const char *rep, int nmat, const int *replen)
diff --git a/debian/patches/sipwise_fix_chan_usage.patch b/debian/patches/sipwise_fix_chan_usage.patch
index 93924fa..542d908 100644
--- a/debian/patches/sipwise_fix_chan_usage.patch
+++ b/debian/patches/sipwise_fix_chan_usage.patch
@@ -7,7 +7,7 @@ Subject: sipwise_fix_chan_usage
  1 file changed, 2 insertions(+)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 691b730..8320012 100644
+index efa0e20..893cae6 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -15460,7 +15460,9 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
diff --git a/debian/patches/sipwise_vm_add_arabic_support.patch b/debian/patches/sipwise_vm_add_arabic_support.patch
index 87982b6..07946a0 100644
--- a/debian/patches/sipwise_vm_add_arabic_support.patch
+++ b/debian/patches/sipwise_vm_add_arabic_support.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_add_arabic_support
  1 file changed, 94 insertions(+), 2 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index c969cc2..70efc6c 100644
+index af772f8..1477951 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -9277,8 +9277,10 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
diff --git a/debian/patches/sipwise_vm_add_callid.patch b/debian/patches/sipwise_vm_add_callid.patch
index b0485f1..ff9a12d 100644
--- a/debian/patches/sipwise_vm_add_callid.patch
+++ b/debian/patches/sipwise_vm_add_callid.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_add_callid
  1 file changed, 16 insertions(+), 6 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index fb2e82e..fb2359c 100644
+index 817c32c..d76467d 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -940,7 +940,7 @@ static char odbc_database[80] = "asterisk";
diff --git a/debian/patches/sipwise_vm_ast_load_realtime_use_uuid.patch b/debian/patches/sipwise_vm_ast_load_realtime_use_uuid.patch
index 2cdf5c3..1baa7bb 100644
--- a/debian/patches/sipwise_vm_ast_load_realtime_use_uuid.patch
+++ b/debian/patches/sipwise_vm_ast_load_realtime_use_uuid.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_ast_load_realtime_use_uuid
  1 file changed, 18 insertions(+), 5 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 523a725..f6432de 100644
+index 1e615aa..1889220 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -1858,7 +1858,7 @@ static int is_valid_dtmf(const char *key)
diff --git a/debian/patches/sipwise_vm_asterisk_16_support.patch b/debian/patches/sipwise_vm_asterisk_16_support.patch
index f8e338b..c489ac7 100644
--- a/debian/patches/sipwise_vm_asterisk_16_support.patch
+++ b/debian/patches/sipwise_vm_asterisk_16_support.patch
@@ -39,7 +39,7 @@ index 2e85d4c..e7ad660 100644
  #include "asterisk/file.h"
  #include "asterisk/pbx.h"
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index d89fd8b..80688c8 100644
+index 1964bec..0fe8673 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -80,6 +80,9 @@
diff --git a/debian/patches/sipwise_vm_ext_timezone.patch b/debian/patches/sipwise_vm_ext_timezone.patch
index 394f4d1..74e5463 100644
--- a/debian/patches/sipwise_vm_ext_timezone.patch
+++ b/debian/patches/sipwise_vm_ext_timezone.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_ext_timezone
  1 file changed, 67 insertions(+)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 79cb895..10034f7 100644
+index 79cb895..af86182 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -1031,6 +1031,8 @@ static int passwordlocation;
@@ -49,7 +49,7 @@ index 79cb895..10034f7 100644
 +	struct odbc_obj *obj = NULL;
 +	SQLHSTMT stmt = NULL;
 +
-+	if (vmu->mailbox == NULL || ast_strlen_zero(sw_timezone_table))
++	if (ast_strlen_zero(sw_timezone_table))
 +		return;
 +
 +	snprintf(sql, sizeof(sql),
diff --git a/debian/patches/sipwise_vm_externnotify_by_uuid.patch b/debian/patches/sipwise_vm_externnotify_by_uuid.patch
index beb7e00..9251035 100644
--- a/debian/patches/sipwise_vm_externnotify_by_uuid.patch
+++ b/debian/patches/sipwise_vm_externnotify_by_uuid.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_externnotify_by_uuid
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 97359f8..c825fee 100644
+index df175fe..581af06 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -6570,15 +6570,15 @@ static void run_externnotify(char *context, char *extension, const char *flag, c
diff --git a/debian/patches/sipwise_vm_find_user_by_alias_prio_uuid.patch b/debian/patches/sipwise_vm_find_user_by_alias_prio_uuid.patch
index 99595fb..53ad836 100644
--- a/debian/patches/sipwise_vm_find_user_by_alias_prio_uuid.patch
+++ b/debian/patches/sipwise_vm_find_user_by_alias_prio_uuid.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_find_user_by_alias_prio_uuid
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index fb2359c..523a725 100644
+index d76467d..1e615aa 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -4244,26 +4244,26 @@ static struct ast_vm_user *find_user_realtime_by_alias(struct ast_vm_user *ivm,
diff --git a/debian/patches/sipwise_vm_fix_compile_warnings.patch b/debian/patches/sipwise_vm_fix_compile_warnings.patch
index 1acc494..0147146 100644
--- a/debian/patches/sipwise_vm_fix_compile_warnings.patch
+++ b/debian/patches/sipwise_vm_fix_compile_warnings.patch
@@ -22,7 +22,7 @@ index ad0c960..fc52c48 100644
  
  all: _all
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 10034f7..fb2e82e 100644
+index af86182..817c32c 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -5063,16 +5063,11 @@ static int vm_delete(char *file)
diff --git a/debian/patches/sipwise_vm_fix_envelope_play.patch b/debian/patches/sipwise_vm_fix_envelope_play.patch
index a7ce48b..21f3b78 100644
--- a/debian/patches/sipwise_vm_fix_envelope_play.patch
+++ b/debian/patches/sipwise_vm_fix_envelope_play.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_envelope_play
  1 file changed, 4 insertions(+)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 4bb1321..d89fd8b 100644
+index e11ec69..1964bec 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -12442,8 +12442,10 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
diff --git a/debian/patches/sipwise_vm_fix_odbc_retreive_file.patch b/debian/patches/sipwise_vm_fix_odbc_retreive_file.patch
index ad4cf7e..8106413 100644
--- a/debian/patches/sipwise_vm_fix_odbc_retreive_file.patch
+++ b/debian/patches/sipwise_vm_fix_odbc_retreive_file.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_odbc_retreive_file
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index f6432de..691b730 100644
+index 1889220..efa0e20 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -4028,7 +4028,7 @@ static void odbc_update_msg_id(char *dir, int msg_num, char *msg_id)
diff --git a/debian/patches/sipwise_vm_fix_prev_message.patch b/debian/patches/sipwise_vm_fix_prev_message.patch
index c659791..116ab11 100644
--- a/debian/patches/sipwise_vm_fix_prev_message.patch
+++ b/debian/patches/sipwise_vm_fix_prev_message.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_fix_prev_message
  1 file changed, 1 insertion(+)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 70efc6c..1f39eb2 100644
+index 1477951..cd2b176 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -12206,6 +12206,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
diff --git a/debian/patches/sipwise_vm_hebrew_language_fixups.patch b/debian/patches/sipwise_vm_hebrew_language_fixups.patch
index 548693b..c22b86c 100644
--- a/debian/patches/sipwise_vm_hebrew_language_fixups.patch
+++ b/debian/patches/sipwise_vm_hebrew_language_fixups.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_hebrew_language_fixups
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index c825fee..c969cc2 100644
+index 581af06..af772f8 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -9276,10 +9276,14 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
diff --git a/debian/patches/sipwise_vm_pointers_malloc.patch b/debian/patches/sipwise_vm_pointers_malloc.patch
index 20fe620..be2dbe8 100644
--- a/debian/patches/sipwise_vm_pointers_malloc.patch
+++ b/debian/patches/sipwise_vm_pointers_malloc.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_pointers_malloc
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 80688c8..1c36c7e 100644
+index 0fe8673..312be2a 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -1373,7 +1373,7 @@ static char *edit(const char *str, int len, const char *rep,
diff --git a/debian/patches/sipwise_vm_store_message_add_diag_info.patch b/debian/patches/sipwise_vm_store_message_add_diag_info.patch
index da1405e..5f89e73 100644
--- a/debian/patches/sipwise_vm_store_message_add_diag_info.patch
+++ b/debian/patches/sipwise_vm_store_message_add_diag_info.patch
@@ -7,7 +7,7 @@ Subject: sipwise_vm_store_message_add_diag_info
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
-index 8320012..4bb1321 100644
+index 893cae6..e11ec69 100644
 --- a/apps/app_voicemail.c
 +++ b/apps/app_voicemail.c
 @@ -4589,6 +4589,10 @@ static SQLHSTMT insert_data_cb(struct odbc_obj *obj, void *vdata)