diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
index 641793b..3e88d71 100644
--- a/app/src/main/res/layout-land/download.xml
+++ b/app/src/main/res/layout-land/download.xml
@@ -53,7 +53,7 @@
 				android:layout_centerHorizontal="true"
 				android:layout_marginLeft="12dip"
 				android:layout_marginRight="12dip"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="end"
 				android:gravity="center_horizontal"
 				android:textAppearance="?android:attr/textAppearanceMedium"
@@ -68,7 +68,7 @@
 				android:layout_marginBottom="8dip"
 				android:layout_marginLeft="12dip"
 				android:layout_marginRight="12dip"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="end"
 				android:textAppearance="?android:attr/textAppearanceSmall"
 				android:textColor="?android:textColorSecondary"
diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
index d134e80..bfbc585 100644
--- a/app/src/main/res/layout-large-land/download.xml
+++ b/app/src/main/res/layout-large-land/download.xml
@@ -54,7 +54,7 @@
 			android:layout_centerHorizontal="true"
 			android:layout_marginLeft="12dip"
 			android:layout_marginRight="12dip"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:ellipsize="end"
 			android:gravity="center_horizontal"
 			android:textAppearance="?android:attr/textAppearanceMedium"
@@ -69,7 +69,7 @@
 			android:layout_marginBottom="8dip"
 			android:layout_marginLeft="12dip"
 			android:layout_marginRight="12dip"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:ellipsize="end"
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:textColor="?android:textColorSecondary"
diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml
index 37568e4..d9c1033 100644
--- a/app/src/main/res/layout-port/download.xml
+++ b/app/src/main/res/layout-port/download.xml
@@ -60,7 +60,7 @@
 					android:layout_marginLeft="16dip"
 					android:layout_marginRight="16dip"
 					android:layout_marginTop="6dp"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:ellipsize="end"
 					style="?attr/actionbarSubtitleStyle"
 					android:textColor="?android:textColorSecondary"/>
@@ -72,7 +72,7 @@
 					android:layout_gravity="center_horizontal"
 					android:layout_marginLeft="16dip"
 					android:layout_marginRight="16dip"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:textStyle="bold"
 					style="?attr/actionbarTitleStyle"
 					android:textColor="?android:textColorPrimary"/>
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index e59664a..9e18b95 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -74,7 +74,7 @@
 						android:id="@+id/track_name"
 						android:layout_height="wrap_content"
 						android:layout_width="wrap_content"
-						android:singleLine="true"
+						android:maxLines="1"
 						android:text="@string/main.title"
 						android:ellipsize="marquee"
 						android:marqueeRepeatLimit="marquee_forever"
@@ -92,7 +92,7 @@
 						android:id="@+id/artist_name"
 						android:layout_height="wrap_content"
 						android:layout_width="wrap_content"
-						android:singleLine="true"
+						android:maxLines="1"
 						android:text="@string/main.artist"
 						style="?attr/actionbarSubtitleStyle"/>
 				</LinearLayout>
diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index 82cf71c..efcfb30 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -41,7 +41,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:ellipsize="marquee"
 					android:text="@string/search.albums"
 					android:textColor="?android:textColorPrimary"
@@ -58,7 +58,7 @@
 						android:layout_height="wrap_content"
 						android:textSize="12sp"
 						android:textColor="?android:textColorSecondary"
-						android:singleLine="true"
+						android:maxLines="1"
 						android:text="@string/search.artists"
 						android:paddingLeft="@dimen/Card.TextLeftPadding"/>
 				</LinearLayout>
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index ee975dc..3045d39 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -31,7 +31,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:ellipsize="marquee"
 			android:paddingBottom="6dip"
 			android:textColor="?android:textColorPrimary"/>
@@ -41,7 +41,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:textColor="?android:textColorSecondary"/>
 
 	</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml
index 5f2536d..b9d13ca 100644
--- a/app/src/main/res/layout/appwidget4x1.xml
+++ b/app/src/main/res/layout/appwidget4x1.xml
@@ -43,7 +43,7 @@
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
                 android:paddingTop="4dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:gravity="center_horizontal"
                 android:text="Title"
                 android:textColor="@color/appwidget_text"
@@ -69,7 +69,7 @@
                 android:minHeight="12sp"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:gravity="center_horizontal"
                 android:text="Artist"
                 android:textColor="@color/appwidget_text"
@@ -107,4 +107,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml
index ae61353..dad82bc 100644
--- a/app/src/main/res/layout/appwidget4x2.xml
+++ b/app/src/main/res/layout/appwidget4x2.xml
@@ -46,7 +46,7 @@
                 android:paddingRight="4dip"
                 android:paddingTop="4dip"
 				android:paddingBottom="2dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:gravity="center_horizontal"
                 android:text="Title"
                 android:textColor="@color/appwidget_text"
@@ -73,7 +73,7 @@
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
 				android:paddingBottom="2dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:gravity="center_horizontal"
                 android:text="Artist"
                 android:textColor="@color/appwidget_text"
@@ -90,7 +90,7 @@
                 android:paddingBottom="2dip"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:gravity="center_horizontal"
                 android:text="Album"
                 android:textColor="@color/appwidget_text"
@@ -133,4 +133,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml
index 0ffb9d4..c30a68d 100644
--- a/app/src/main/res/layout/appwidget4x3.xml
+++ b/app/src/main/res/layout/appwidget4x3.xml
@@ -46,7 +46,7 @@
                 android:minHeight="16sp"
                 android:paddingLeft="5dip"
                 android:paddingRight="5dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textColor="@color/appwidget_text"
                 android:textSize="16sp"
                 android:text="Title"
@@ -73,7 +73,7 @@
                 android:minHeight="12sp"
                 android:paddingBottom="2dip"
                 android:paddingLeft="5dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:text="Artist"
                 android:layout_gravity="center_horizontal"
             	android:gravity="center"
@@ -116,4 +116,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml
index d0668c2..7f87698 100644
--- a/app/src/main/res/layout/appwidget4x4.xml
+++ b/app/src/main/res/layout/appwidget4x4.xml
@@ -47,7 +47,7 @@
                 android:minHeight="16sp"
                 android:paddingLeft="5dip"
                 android:paddingRight="5dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textColor="@color/appwidget_text"
                 android:textSize="16sp"
                 android:text="Title"
@@ -74,7 +74,7 @@
                 android:minHeight="12sp"
                 android:paddingBottom="2dip"
                 android:paddingLeft="5dip"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:text="Artist"
                 android:layout_gravity="center_horizontal"
             	android:gravity="center"
@@ -118,4 +118,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/basic_art_item.xml b/app/src/main/res/layout/basic_art_item.xml
index e9c45fc..62eb6c3 100644
--- a/app/src/main/res/layout/basic_art_item.xml
+++ b/app/src/main/res/layout/basic_art_item.xml
@@ -20,7 +20,7 @@
 		android:paddingLeft="10dip"
 		android:paddingRight="3dip"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:singleLine="true"
+		android:maxLines="1"
 		android:ellipsize="marquee"
 		android:textColor="?android:textColorPrimary"/>
 
diff --git a/app/src/main/res/layout/basic_cell_item.xml b/app/src/main/res/layout/basic_cell_item.xml
index 15acfea..a71a534 100644
--- a/app/src/main/res/layout/basic_cell_item.xml
+++ b/app/src/main/res/layout/basic_cell_item.xml
@@ -28,7 +28,7 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="marquee"
 				android:textColor="?android:textColorPrimary"
 				android:paddingLeft="@dimen/Card.TextLeftPadding"/>
@@ -42,4 +42,4 @@
 				style="@style/MoreButton"/>
 		</LinearLayout>
 	</LinearLayout>
-</net.nullsum.audinaut.view.CardView>
\ No newline at end of file
+</net.nullsum.audinaut.view.CardView>
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index fb30e16..39ca31a 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -15,7 +15,7 @@
 		android:paddingLeft="6dip"
 		android:paddingRight="6dip"
 		android:minHeight="50dip"
-		android:singleLine="true"
+		android:maxLines="1"
 		android:ellipsize="marquee"
 		android:background="@android:color/transparent"
 		android:textColor="?android:textColorPrimary"/>
@@ -42,4 +42,4 @@
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 0ab5a88..5e2241a 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -28,7 +28,7 @@
 			android:layout_gravity="left"
 			android:ellipsize="marquee"
 			android:focusable="true"
-			android:singleLine="true" />
+			android:maxLines="1" />
 
 		<TextView
 			android:id="@+id/notification_artist"
@@ -38,7 +38,7 @@
 			android:layout_gravity="left"
 			android:ellipsize="end"
 			android:scrollHorizontally="true"
-			android:singleLine="true" />
+			android:maxLines="1" />
 
 		<TextView
 			android:id="@+id/notification_album"
diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml
index a158621..1140f6d 100644
--- a/app/src/main/res/layout/notification_expanded.xml
+++ b/app/src/main/res/layout/notification_expanded.xml
@@ -32,7 +32,7 @@
 				android:layout_gravity="left|center_vertical"
 				android:ellipsize="marquee"
 				android:focusable="true"
-				android:singleLine="true" />
+				android:maxLines="1" />
 
 			<ImageButton
 				android:id="@+id/notification_close"
@@ -52,7 +52,7 @@
 	        android:layout_gravity="left"
 	        android:ellipsize="end"
 	        android:scrollHorizontally="true"
-	        android:singleLine="true" />
+	        android:maxLines="1" />
 
 	    <TextView
 	        android:id="@+id/notification_album"
@@ -62,7 +62,7 @@
 	        android:layout_gravity="left"
 	        android:ellipsize="end"
 	        android:scrollHorizontally="true"
-	        android:singleLine="true"
+	        android:maxLines="1"
 			android:paddingBottom="10dp"/>
 
 		<ImageView
diff --git a/app/src/main/res/layout/save_playlist.xml b/app/src/main/res/layout/save_playlist.xml
index 9a85d24..131d93e 100644
--- a/app/src/main/res/layout/save_playlist.xml
+++ b/app/src/main/res/layout/save_playlist.xml
@@ -11,7 +11,7 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:inputType="text"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 	<CheckBox
 			android:id="@+id/save_playlist_overwrite"
diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml
index 0ad69a6..121f243 100644
--- a/app/src/main/res/layout/select_album_header.xml
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -25,7 +25,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceLarge"
 				android:textStyle="bold"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="marquee"
 				android:marqueeRepeatLimit="marquee_forever"
 				android:scrollHorizontally="true"
@@ -44,7 +44,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="end"
 				android:textColor="?android:textColorPrimary"/>
 
@@ -55,7 +55,7 @@
 				android:layout_height="wrap_content"
 				android:paddingTop="14dip"
 				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="none"
 				android:textColor="?android:textColorSecondary"/>
 
@@ -65,7 +65,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="none"
 				android:textColor="?android:textColorSecondary"/>
 
diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
index 7c7eccd..5cd7503 100644
--- a/app/src/main/res/layout/song_list_item.xml
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -35,7 +35,7 @@
 				android:layout_weight="1"
 				android:layout_gravity="left|top"
 				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:ellipsize="marquee"
 				android:paddingLeft="6dip"
 				android:paddingRight="6dip"
@@ -83,7 +83,7 @@
                     android:layout_weight="1"
                     android:layout_gravity="left|center_vertical"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
+                    android:maxLines="1"
                     android:ellipsize="middle"
                     android:paddingLeft="6dip"
 					android:textColor="?android:textColorSecondary"/>
@@ -94,7 +94,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right|center_vertical"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
+                    android:maxLines="1"
                     android:paddingLeft="3dip"
                     android:paddingRight="4dip"
 					android:textColor="?android:textColorSecondary"/>