Index: channels/chan_skinny.c
===================================================================
--- channels/chan_skinny.c	(revision 53778)
+++ channels/chan_skinny.c	(working copy)
@@ -322,6 +322,17 @@
 	uint32_t type;
 	char originalCalledPartyName[40];
 	char originalCalledParty[24];
+	char lastRedirectingPartyName[40];
+	char lastRedirectingParty[24];
+	uint32_t originalCdpnRedirectReason;
+	uint32_t lastRedirectingReason;
+	char cgpnVoiceMailbox[24];
+	char cdpnVoiceMailbox[24];
+	char originalCdpnVoiceMailbox[24];
+	char lastRedirectingVoiceMailbox[24];
+	uint32_t callInstance;
+	uint32_t callSecurityStatus;
+	char partyPIRestrictionBits;
 };
 
 #define SPEED_DIAL_STAT_RES_MESSAGE 0x0091
@@ -1410,7 +1421,7 @@
 		}
 		
 	}
-	
+
 	ast_mutex_unlock(&s->lock);
 	return 1;
 }
@@ -1487,6 +1498,9 @@
 	if (!(req = req_alloc(sizeof(struct call_info_message), CALL_INFO_MESSAGE)))
 		return;
 
+	if (skinnydebug)
+			ast_verbose("Setting Callinfo to %s(%s) from %s(%s) on %s(%d)\n", fromname, fromnum, toname, tonum, s->device->name, instance);
+
 	if (fromname) {
 		ast_copy_string(req->data.callinfo.callingPartyName, fromname, sizeof(req->data.callinfo.callingPartyName));
 	}
@@ -2341,6 +2355,7 @@
 	struct skinny_line *l = sub->parent;
 	struct skinny_device *d = l->parent;
 	struct skinnysession *s = d->session;
+	char tempMessage[32];
 
 	if (!d->registered) {
 		ast_log(LOG_ERROR, "Device not registered, cannot call %s\n", dest);
@@ -2379,6 +2394,13 @@
 	transmit_callinfo(s, ast->cid.cid_name, ast->cid.cid_num, l->cid_name, l->cid_num, l->instance, sub->callid, 1);
 	transmit_callstate(s, l->instance, SKINNY_RINGIN, sub->callid);
 	transmit_displaypromptstatus(s, "Ring-In", 0, l->instance, sub->callid);
+
+	memset(tempMessage,0,32);
+	memset(tempMessage,0x80,1);
+	memset(tempMessage+1,0x17,1);
+	memcpy(tempMessage+2, ast->cid.cid_num, 30);
+
+	transmit_displaypromptstatus(s, tempMessage, 0, l->instance, sub->callid);
 	transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_RINGIN);
 
 	ast_setstate(ast, AST_STATE_RINGING);