--- asterisk-10.1.0/funcs/func_callerid.c.old	2012-02-10 17:20:46.821555418 +0100
+++ asterisk-10.1.0/funcs/func_callerid.c	2012-02-10 17:21:59.200559097 +0100
@@ -692,8 +692,7 @@ static enum ID_FIELD_STATUS party_subadd
 
 	if (argc == 0) {
 		/* We are setting the subaddress string */
-		subaddress->str = ast_strdup(value);
-		ast_trim_blanks(subaddress->str);
+		subaddress->str = ast_unescape_c(ast_strdup(value));
 	} else if (argc == 1 && !strcasecmp("valid", argv[0])) {
 		subaddress->valid = atoi(value) ? 1 : 0;
 	} else if (argc == 1 && !strcasecmp("type", argv[0])) {