diff --git a/app/build.gradle b/app/build.gradle
index c7d682ee..40ddd210 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,7 +36,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.2.19'
+    implementation 'com.simplemobiletools:commons:3.2.20'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
index f820f315..aad5cbee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
@@ -146,9 +146,25 @@ class ContactActivity : SimpleActivity() {
         contact_first_name.setText(contact!!.firstName)
         contact_middle_name.setText(contact!!.middleName)
         contact_surname.setText(contact!!.surname)
-        //contact_number.setText(contact!!.number)
-        //contact_email.setText(contact!!.email)
         contact_source.text = contact!!.source
+
+        contact!!.phoneNumbers.forEachIndexed { index, number ->
+            if (index == 0) {
+                contact_number.setText(number.value)
+                contact_number_type.setText(number.getTextId())
+            } else {
+
+            }
+        }
+
+        contact!!.emails.forEachIndexed { index, email ->
+            if (index == 0) {
+                contact_email.setText(email.value)
+                contact_email_type.setText(email.getTextId())
+            } else {
+
+            }
+        }
     }
 
     private fun setupNewContact() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt
index 268bf7e9..5e282d10 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Email.kt
@@ -1,3 +1,13 @@
 package com.simplemobiletools.contacts.models
 
-data class Email(var value: String, var type: Int)
+import android.provider.ContactsContract
+import com.simplemobiletools.contacts.R
+
+data class Email(var value: String, var type: Int) {
+    fun getTextId() = when (type) {
+        ContactsContract.CommonDataKinds.Email.TYPE_HOME -> R.string.home
+        ContactsContract.CommonDataKinds.Email.TYPE_WORK -> R.string.work
+        ContactsContract.CommonDataKinds.Email.TYPE_MOBILE -> R.string.mobile
+        else -> R.string.other
+    }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt
index e1eee4cf..0d4326c6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/PhoneNumber.kt
@@ -1,3 +1,17 @@
 package com.simplemobiletools.contacts.models
 
-data class PhoneNumber(var value: String, var type: Int)
+import android.provider.ContactsContract
+import com.simplemobiletools.contacts.R
+
+data class PhoneNumber(var value: String, var type: Int) {
+    fun getTextId() = when (type) {
+        ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE -> R.string.mobile
+        ContactsContract.CommonDataKinds.Phone.TYPE_HOME -> R.string.home
+        ContactsContract.CommonDataKinds.Phone.TYPE_WORK -> R.string.work
+        ContactsContract.CommonDataKinds.Phone.TYPE_MAIN -> R.string.main_number
+        ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK -> R.string.work_fax
+        ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME -> R.string.home_fax
+        ContactsContract.CommonDataKinds.Phone.TYPE_PAGER -> R.string.pager
+        else -> R.string.other
+    }
+}