diff --git a/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.kt b/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.kt
index 2e919d2..a87a73e 100644
--- a/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.kt
+++ b/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.kt
@@ -27,7 +27,7 @@ import ch.dissem.apps.abit.listener.ListSelectionListener
 /**
  * @author Christian Basler
  */
-abstract class AbstractItemListFragment<L, T> : ListFragment(), ListHolder<L> {
+abstract class AbstractItemListFragment<in L, T> : ListFragment(), ListHolder<L> {
     /**
      * The fragment's current callback object, which is notified of list item
      * clicks.
diff --git a/app/src/main/java/ch/dissem/apps/abit/util/PRNGFixes.java b/app/src/main/java/ch/dissem/apps/abit/util/PRNGFixes.java
index 38bda8b..52be606 100644
--- a/app/src/main/java/ch/dissem/apps/abit/util/PRNGFixes.java
+++ b/app/src/main/java/ch/dissem/apps/abit/util/PRNGFixes.java
@@ -39,6 +39,7 @@ import java.security.Security;
  * @see <a href="http://android-developers.blogspot.ch/2013/08/some-securerandom-thoughts.html">
  * http://android-developers.blogspot.ch/2013/08/some-securerandom-thoughts.html</a>
  */
+@SuppressWarnings("WeakerAccess")
 public final class PRNGFixes {
 
     private static final int VERSION_CODE_JELLY_BEAN = 16;
diff --git a/app/src/main/res/drawable/bg_item_swiping_active_state.xml b/app/src/main/res/drawable/bg_item_swiping_active_state.xml
deleted file mode 100644
index b90dbeb..0000000
--- a/app/src/main/res/drawable/bg_item_swiping_active_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Copyright (C) 2015 Haruki Hasegawa
-
-       Licensed under the Apache License, Version 2.0 (the "License");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an "AS IS" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <color android:color="@color/bg_item_swiping_active_state"/>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/bg_item_swiping_state.xml b/app/src/main/res/drawable/bg_item_swiping_state.xml
deleted file mode 100644
index 00ca171..0000000
--- a/app/src/main/res/drawable/bg_item_swiping_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Copyright (C) 2015 Haruki Hasegawa
-
-       Licensed under the Apache License, Version 2.0 (the "License");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an "AS IS" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <color android:color="@color/bg_item_swiping_state"/>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/layout/dialog_select_message_encoding.xml b/app/src/main/res/layout/dialog_select_message_encoding.xml
index f9bef0f..3c7e3d4 100644
--- a/app/src/main/res/layout/dialog_select_message_encoding.xml
+++ b/app/src/main/res/layout/dialog_select_message_encoding.xml
@@ -50,14 +50,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
-            android:text="SIMPLE"/>
+            android:text="@string/encoding_simple"/>
 
         <RadioButton
             android:id="@+id/extended"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
-            android:text="EXTENDED"/>
+            android:text="@string/encoding_extended"/>
 
     </RadioGroup>
 
diff --git a/app/src/main/res/menu/import_input_data.xml b/app/src/main/res/menu/import_input_data.xml
index 9e8665b..35a0fa7 100644
--- a/app/src/main/res/menu/import_input_data.xml
+++ b/app/src/main/res/menu/import_input_data.xml
@@ -18,7 +18,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/open_file"
         android:title="@string/open_file"
         android:icon="@drawable/ic_action_open_file"
         app:showAsAction="ifRoom"/>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 086c834..f71c93c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -109,9 +109,9 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="status_received">empfangen</string>
     <string name="status_sent">gesendet</string>
     <string name="status_sent_acknowledged">Empfang bestätigt</string>
-    <string name="error_unsupported_encoding">Codierung ‘%s’ wird nicht unterstützt, es wird ‘SIMPLE’ verwendet.</string>
+    <string name="error_unsupported_encoding">Codierung ‘%s’ wird nicht unterstützt, es wird ‘einfach’ verwendet.</string>
     <string name="select_encoding_title">Kodierung auswählen</string>
-    <string name="select_encoding_warning">‘EXTENDED’ ist ein neues Datenformat welches noch nicht überall funktioniert, es hat jedoch einige interessante Vorteile. Wähle ‘SIMPLE’ um sicher zu gehen.</string>
+    <string name="select_encoding_warning">‘Erweitert’ ist ein neues Datenformat welches noch nicht überall funktioniert, es hat jedoch einige interessante Vorteile. Wähle ‘einfach’ um sicher zu gehen.</string>
     <string name="cleanup">Aufräumen</string>
     <string name="cleanup_notification_start">Aufräumarbeiten gestartet</string>
     <string name="cleanup_notification_end">Aufräumarbeiten beendet</string>
@@ -135,4 +135,6 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="unread">Ungelesen</string>
     <string name="trash">Papierkorb</string>
     <string name="broadcasts">Broadcasts</string>
+    <string name="encoding_simple">einfach</string>
+    <string name="encoding_extended">erweitert</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2e872e0..48ae83d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -105,8 +105,8 @@
     <string name="status_draft">brouillon</string>
     <string name="status_sent">envoyé</string>
     <string name="status_received">reçu</string>
-    <string name="error_unsupported_encoding">Encodage non supporté \'%s\', \'SIMPLE\' est utilisé.</string>
-    <string name="select_encoding_warning">\'EXTENDED\' est un nouveau format de message qui ne fonctionne pas encore partout, mais qui a des avantages intéressants. Sélectionnez \'SIMPLE\' pour être sûr.</string>
+    <string name="error_unsupported_encoding">Encodage non supporté \'%s\', \'simple\' est utilisé.</string>
+    <string name="select_encoding_warning">\'Étendu\' est un nouveau format de message qui ne fonctionne pas encore partout, mais qui a des avantages intéressants. Sélectionnez \'simple\' pour être sûr.</string>
     <string name="select_encoding_title">Sélectionner le codage des messages</string>
     <string name="cleanup">Nettoyage</string>
     <string name="cleanup_summary">Supprimer les entrées d\'inventaire obsolètes</string>
@@ -132,4 +132,6 @@
     <string name="unread">Non lues</string>
     <string name="trash">Corbeille</string>
     <string name="broadcasts">Diffusions</string>
+    <string name="encoding_simple">simple</string>
+    <string name="encoding_extended">étendu</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc041e3..3e0747a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,8 +108,8 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="status_draft">draft</string>
     <string name="status_sent">sent</string>
     <string name="status_received">received</string>
-    <string name="error_unsupported_encoding">Unsupported encoding ‘%s’, using ‘SIMPLE’ instead.</string>
-    <string name="select_encoding_warning">‘EXTENDED’ is a new message format that\'s not widely supported yet but has some interesting features. To stay on the save side, select ‘SIMPLE’.</string>
+    <string name="error_unsupported_encoding">Unsupported encoding ‘%s’, using ‘simple’ instead.</string>
+    <string name="select_encoding_warning">‘Extended’ is a new message format that\'s not widely supported yet but has some interesting features. To stay on the save side, select ‘simple’.</string>
     <string name="select_encoding_title">Select Message Encoding</string>
     <string name="cleanup">Cleanup</string>
     <string name="cleanup_summary">Remove outdated inventory entries</string>
@@ -134,4 +134,6 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="unread">Unread</string>
     <string name="trash">Trash</string>
     <string name="broadcasts">Broadcasts</string>
+    <string name="encoding_simple">simple</string>
+    <string name="encoding_extended">extended</string>
 </resources>
diff --git a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidAddressRepositoryTest.kt b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidAddressRepositoryTest.kt
index 078c887..f983bb0 100644
--- a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidAddressRepositoryTest.kt
+++ b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidAddressRepositoryTest.kt
@@ -16,7 +16,6 @@
 
 package ch.dissem.bitmessage.repository
 
-import android.os.Build
 import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidAddressRepository
 import ch.dissem.apps.abit.repository.SqlHelper
diff --git a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidInventoryTest.kt b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidInventoryTest.kt
index 41ed627..60f9ad3 100644
--- a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidInventoryTest.kt
+++ b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidInventoryTest.kt
@@ -16,7 +16,6 @@
 
 package ch.dissem.bitmessage.repository
 
-import android.os.Build
 import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidInventory
 import ch.dissem.apps.abit.repository.SqlHelper
diff --git a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidLabelRepositoryTest.kt b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidLabelRepositoryTest.kt
index 5d01c70..ee94a4f 100644
--- a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidLabelRepositoryTest.kt
+++ b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidLabelRepositoryTest.kt
@@ -16,13 +16,12 @@
 
 package ch.dissem.bitmessage.repository
 
-import android.os.Build
 import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidLabelRepository
 import ch.dissem.apps.abit.repository.SqlHelper
 import ch.dissem.bitmessage.entity.valueobject.Label
 import ch.dissem.bitmessage.ports.LabelRepository
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidNodeRegistryTest.kt b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidNodeRegistryTest.kt
index acaeeff..aa697c9 100644
--- a/app/src/test/java/ch/dissem/bitmessage/repository/AndroidNodeRegistryTest.kt
+++ b/app/src/test/java/ch/dissem/bitmessage/repository/AndroidNodeRegistryTest.kt
@@ -16,7 +16,6 @@
 
 package ch.dissem.bitmessage.repository
 
-import android.os.Build
 import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidNodeRegistry
 import ch.dissem.apps.abit.repository.SqlHelper