diff --git a/sms.py b/sms.py
index 9762b50..6f175f7 100644
--- a/sms.py
+++ b/sms.py
@@ -84,8 +84,10 @@ class SMS_Service (Thread):
 					l [i ['threadid']] [1] = i ['received']
 					l [i ['threadid']] [2] = i ['body']
 					l [i ['threadid']] [3] += 1
+					if len (l [i ['threadid']]) == 4 and 'sender' in i and i ['type'] == 'inbox':
+						l [i ['threadid']].append (i ['sender'])
 			else:
-				if 'sender' in i:
+				if 'sender' in i and i ['type'] == 'inbox':
 					l [i ['threadid']] = [i ['number'], i ['received'], i ['body'], 1, i ['sender']]
 				else:
 					l [i ['threadid']] = [i ['number'], i ['received'], i ['body'], 1]
@@ -100,6 +102,6 @@ class SMS_Service (Thread):
 				l.append ((i ['received'], True if i ['type'] == 'inbox' else False, i ['body']))
 				if number is None:
 					number = i ['number']
-					if 'sender' in i:
-						name = i ['sender']
+				if name is None and i ['type'] == 'inbox' and 'sender' in i:
+					name = i ['sender']
 		return (number, name, sorted (l, key = lambda item: item [0]))
\ No newline at end of file