Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index 0a339aa..0df19bb 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -37,7 +37,17 @@
 		</p>
 		{% endif %}
 		{% if (contact_list[i].address) { %}
-			{%= __("Address ") %}: {%= contact_list[i].address %}<br>
+			{%= __("Address ") %}: {%= contact_list[i].address %}
+				{% if (contact_list[i].city) { %}
+					, {%= contact_list[i].city %}
+				{% endif %}
+				{% if (contact_list[i].state) { %}
+					, {%= contact_list[i].state %}
+				{% endif %}
+				{% if (contact_list[i].country) { %}
+					, {%= contact_list[i].country %}
+				{% endif %}
+			<br>
 		{% endif %}
 	</div>
 {% } %}