diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
index 4e3a8d180..4a92c5b0a 100644
--- a/jni/dc_wrapper.c
+++ b/jni/dc_wrapper.c
@@ -1857,6 +1857,11 @@ JNIEXPORT jint Java_com_b44t_messenger_DcContact_getVerifierId(JNIEnv *env, jobj
     return dc_contact_get_verifier_id(get_dc_contact(env, obj));
 }
 
+JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isBot(JNIEnv *env, jobject obj)
+{
+    return dc_contact_is_bot(get_dc_contact(env, obj)) != 0;
+}
+
 
 /*******************************************************************************
  * DcLot
diff --git a/src/main/java/com/b44t/messenger/DcContact.java b/src/main/java/com/b44t/messenger/DcContact.java
index 0f61d9107..f1961a5bd 100644
--- a/src/main/java/com/b44t/messenger/DcContact.java
+++ b/src/main/java/com/b44t/messenger/DcContact.java
@@ -58,6 +58,7 @@ public class DcContact {
     public native boolean isBlocked      ();
     public native boolean isVerified     ();
     public native int     getVerifierId  ();
+    public native boolean isBot          ();
 
     // working with raw c-data
     private long        contactCPtr;    // CAVE: the name is referenced in the JNI
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java b/src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
index 717a61da5..6b9194753 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationTitleView.java
@@ -104,7 +104,9 @@ public class ConversationTitleView extends RelativeLayout {
       }
       else {
         DcContact dcContact = dcContext.getContact(chatContacts[0]);
-        if (profileView || !dcChat.isProtected()) {
+        if (!profileView && dcContact.isBot()) {
+          subtitleStr = context.getString(R.string.bot);
+        } else if (profileView || !dcChat.isProtected()) {
           subtitleStr = dcContact.getAddr();
         }
         isOnline = dcContact.wasSeenRecently();
diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
index 49b148919..4d2163c08 100644
--- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java
@@ -368,7 +368,11 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
           if (chatIsDeviceTalk) {
             return getString(R.string.profile);
           } else if(isContactProfile()) {
-            return getString(R.string.tab_contact);
+            if (dcContext.getContact(contactId).isBot()) {
+              return getString(R.string.bot);
+            } else {
+              return getString(R.string.tab_contact);
+            }
           }
           else if (chatIsBroadcast) {
             return getString(R.string.broadcast_list);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index fcef366c9..068b9977e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -162,6 +162,7 @@
     <string name="video">Video</string>
     <string name="documents">Documents</string>
     <string name="contact">Contact</string>
+    <string name="bot">Bot</string>
     <string name="camera">Camera</string>
     <!-- As in "start a video recording" or "take a photo"; eg. the description of the "shutter button" in cameras -->
     <string name="capture">Capture</string>