3 files changed, 41 insertions, 3 deletions
diff --git a/src/main/res/layout/actionbar_title.xml b/src/main/res/layout/actionbar_title.xml
new file mode 100644
index 00000000..b2d25ed3
--- /dev/null
+++ b/src/main/res/layout/actionbar_title.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="start|center_vertical">
+
+    <github.ankushsachdeva.emojicon.EmojiconTextView
+        android:id="@+id/abTitle"
+        style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:gravity="start|center_vertical"
+        android:paddingTop="1dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="@color/grey200" />
+
+    <github.ankushsachdeva.emojicon.EmojiconTextView
+        android:id="@+id/abSubstitle"
+        style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:scrollHorizontally="true"
+        android:layout_below="@id/abTitle"
+        android:textSize="12sp"
+        android:textColor="@color/grey50"
+        android:gravity="start|center_vertical"
+        android:paddingBottom="1dp" />
+
+</RelativeLayout>
+\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 826bbbb7..d514f08f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -189,10 +189,10 @@
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
   <string name="add_phone_book_text">%s zum Telefonbuch hinzufügen</string>
   <string name="contact_status_online">online</string>
-  <string name="contact_status_free_to_chat">bereit</string>
+  <string name="contact_status_free_to_chat">Frei zum Chatten</string>
   <string name="contact_status_away">abwesend</string>
-  <string name="contact_status_extended_away">länger abwesend</string>
-  <string name="contact_status_do_not_disturb">nicht stören</string>
+  <string name="contact_status_extended_away">nicht verfügbar</string>
+  <string name="contact_status_do_not_disturb">beschäftigt</string>
   <string name="contact_status_offline">offline</string>
   <string name="muc_details_conference">Konferenz</string>
   <string name="muc_details_other_members">Andere Mitglieder</string>
@@ -637,4 +637,6 @@
   <string name="cplus_are_you_sure">Bist du dir sicher?</string>
     <string name="pref_log_stanzas_summary">Stanzas protokollieren, um das Debugging zu erleichtern</string>
   <string name="pref_log_stanzas">Stanzas protokollieren</string>
+  <string name="contact_paused_typing">...macht eine Schreibpause</string>
+  <string name="is_typing">...schreibt</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b76be95d..2055c5de 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -688,4 +688,6 @@
 	<string name="checking_remote_filesize">Checking file size on remote host.</string>
     <string name="pref_log_stanzas_summary">Log stanzas messages to logcat to improve debugging</string>
 	<string name="pref_log_stanzas">Log stanzas</string>
+	<string name="contact_paused_typing">...has stopped typing</string>
+	<string name="is_typing">...is writing</string>
 </resources>