FS-5185 --resolve

src/mod/applications/mod_voicemail/mod_voicemail.c

@@ -3869,19 +3869,14 @@ static void actual_message_query_handler(switch_event_t *event)
 		char *id, *domain;
 
 		dup = strdup(account);
-		id = dup;
 
-		if (!strncasecmp(account, "sip:", 4)) {
-			id += 4;
-		}
+		switch_split_user_domain(dup, &id, &domain);
 
-		if (!id) {
+		if (!id || !domain) {
 			free(dup);
 			return;
 		}
 
-		if ((domain = strchr(id, '@'))) {
-			*domain++ = '\0';
 		profile = NULL;
 
 		if (globals.message_query_exact_match) {
@@ -3902,7 +3897,6 @@ static void actual_message_query_handler(switch_event_t *event)
 				}
 			}
 		}
-		}
 
 		switch_safe_free(dup);