diff --git a/app/build.gradle b/app/build.gradle
index 5e7d924d7..8d206c3df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -127,6 +127,7 @@ dependencies {
 	implementation 'com.mapzen.android:lost:3.0.4'
 	// only added because of lint bug Timber 4.6.0
 	implementation 'com.jakewharton.timber:timber:4.7.0'
+	implementation 'cn.carbs.android:ExpandableTextView:1.0.3'
 
 	implementation "com.google.dagger:dagger:$daggerVersion"
 	kapt "com.google.dagger:dagger-compiler:$daggerVersion"
@@ -163,4 +164,5 @@ dependencies {
 		exclude group: 'com.google.code.findbugs'
 	}
 	kaptAndroidTestDebug "com.google.dagger:dagger-compiler:$daggerVersion"
+
 }
diff --git a/app/src/main/res/layout/list_item_departure.xml b/app/src/main/res/layout/list_item_departure.xml
index 62067224b..9695046d0 100644
--- a/app/src/main/res/layout/list_item_departure.xml
+++ b/app/src/main/res/layout/list_item_departure.xml
@@ -114,7 +114,7 @@
 			app:layout_constraintTop_toBottomOf="@+id/lineNameView"
 			tools:text="Zoologischer Garten (S+U)"/>
 
-		<TextView
+		<cn.carbs.android.expandabletextview.library.ExpandableTextView
 			android:id="@+id/messageView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
@@ -123,8 +123,9 @@
 			android:textSize="12sp"
 			app:layout_constraintLeft_toLeftOf="@+id/guideline"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/destinationView"
-			tools:text="This is a message that would be displayed and might be potentially very long."/>
+			android:text="This is a message that would be displayed and might be potentially very long."
+			app:layout_constraintTop_toBottomOf="@+id/destinationView"/>
+
 
 	</android.support.constraint.ConstraintLayout>