Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 247162)
+++ channels/chan_sip.c	(working copy)
@@ -5530,7 +5530,7 @@
 
 			switch (type) {
 			case 'c':
-				if (audio) {
+				if (audio || image) {
 					if (process_sdp_c(value, &audiohp)) {
 						processed = TRUE;
 						hp = &audiohp.hp;
@@ -5751,7 +5751,7 @@
 		ast_queue_control(p->owner, AST_CONTROL_UNHOLD);
 		/* Activate a re-invite */
 		ast_queue_frame(p->owner, &ast_null_frame);
-	} else if (!sin.sin_addr.s_addr || (sendonly && sendonly != -1)) {
+	} else if (!(sin.sin_addr.s_addr || isin.sin_addr.s_addr) || (sendonly && sendonly != -1)) {
 		ast_queue_control_data(p->owner, AST_CONTROL_HOLD, 
 				       S_OR(p->mohsuggest, NULL),
 				       !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0);