diff --git a/CHANGELOG b/CHANGELOG
index 42611df..e5fc9a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
  * Email content can be seleted/copied (API 11+)
  * Cc: and Bcc: fields
  * Improved performance of email and contact lists
+ * Use ripple effect on API 21+
  * Much better support for legacy devices
  * Help and About screens
  * UI improvements, bug fixes, translation updates
diff --git a/app/src/main/res/drawable-v21/listitem_background.xml b/app/src/main/res/drawable-v21/listitem_background.xml
new file mode 100644
index 0000000..a08f8a9
--- /dev/null
+++ b/app/src/main/res/drawable-v21/listitem_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white"/>
+    </item>
+    <item android:drawable="@drawable/listitem_background_selector"/>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/folder_activated_background.xml b/app/src/main/res/drawable-v21/listitem_background_selector.xml
similarity index 62%
rename from app/src/main/res/drawable/folder_activated_background.xml
rename to app/src/main/res/drawable-v21/listitem_background_selector.xml
index 20d9a9e..4bb82c4 100644
--- a/app/src/main/res/drawable/folder_activated_background.xml
+++ b/app/src/main/res/drawable-v21/listitem_background_selector.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/listitem_selected" android:state_activated="true" />
-    <item android:drawable="@color/listitem_selected" android:state_checked="true" />
-    <item android:drawable="@color/listitem_selected" android:state_pressed="true" />
+    <item android:drawable="@color/listitem_selected" android:state_activated="true"/>
     <item android:drawable="@color/listitem_selected" android:state_selected="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/app/src/main/res/drawable/listitem_checked.xml b/app/src/main/res/drawable/listitem_background_selector.xml
similarity index 91%
rename from app/src/main/res/drawable/listitem_checked.xml
rename to app/src/main/res/drawable/listitem_background_selector.xml
index 34629af..76d0d84 100644
--- a/app/src/main/res/drawable/listitem_checked.xml
+++ b/app/src/main/res/drawable/listitem_background_selector.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/listitem_pressed" android:state_pressed="true" />
-    <item android:drawable="@color/listitem_selected" android:state_activated="true" />
+    <item android:drawable="@color/listitem_selected" android:state_activated="true"/>
     <item android:drawable="@color/listitem_selected" android:state_selected="true" />
     <item android:drawable="@android:color/transparent" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index adba5c8..036c0d3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -57,7 +57,7 @@
                 android:id="@+id/address_book"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background">
+                android:background="@drawable/listitem_background">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -85,7 +85,7 @@
                 android:id="@+id/network_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background">
+                android:background="@drawable/listitem_background">
 
                 <ImageView
                     android:id="@+id/network_status_icon"
diff --git a/app/src/main/res/layout/listitem_email.xml b/app/src/main/res/layout/listitem_email.xml
index 23dd23f..75d0894 100644
--- a/app/src/main/res/layout/listitem_email.xml
+++ b/app/src/main/res/layout/listitem_email.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/listitem_height_three_lines"
-    android:background="@drawable/listitem_checked">
+    android:background="@drawable/listitem_background">
 
     <ImageView
         android:id="@+id/contact_picture"
diff --git a/app/src/main/res/layout/listitem_folder.xml b/app/src/main/res/layout/listitem_folder.xml
index d591dd1..6b1727b 100644
--- a/app/src/main/res/layout/listitem_folder.xml
+++ b/app/src/main/res/layout/listitem_folder.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/folder_activated_background">
+    android:background="@drawable/listitem_background">
 
     <TextView
         android:id="@+id/folder_name"
diff --git a/app/src/main/res/layout/listitem_folder_with_icon.xml b/app/src/main/res/layout/listitem_folder_with_icon.xml
index 5f36b49..b407cd8 100644
--- a/app/src/main/res/layout/listitem_folder_with_icon.xml
+++ b/app/src/main/res/layout/listitem_folder_with_icon.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/folder_activated_background">
+    android:background="@drawable/listitem_background">
 
     <ImageView
         android:id="@+id/folder_icon"
diff --git a/app/src/main/res/raw/help_changelog.html b/app/src/main/res/raw/help_changelog.html
index f81fdba..3183e47 100644
--- a/app/src/main/res/raw/help_changelog.html
+++ b/app/src/main/res/raw/help_changelog.html
@@ -12,6 +12,7 @@ And don't add newlines before or after p tags because of transifex -->
 <li>Email content can be seleted/copied (API 11+)</li>
 <li>Cc: and Bcc: fields</li>
 <li>Improved performance of email and contact lists</li>
+<li>Use ripple effect on API 21+</li>
 <li>Much better support for legacy devices</li>
 <li>Help and About screens</li>
 <li>UI improvements, bug fixes, translation updates</li>
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
new file mode 100644
index 0000000..c2c2d41
--- /dev/null
+++ b/app/src/main/res/values/refs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="listitem_background" type="drawable">@drawable/listitem_background_selector</item>
+</resources>
\ No newline at end of file