diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt
index 5ba29341ed..b93b80153c 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt
@@ -133,7 +133,7 @@ open class VectorPreference : Preference {
             }
 
         } catch (e: Exception) {
-            Timber.e("onBindView " + e.message, e)
+            Timber.e(e, "onBindView")
         }
 
         super.onBindViewHolder(holder)
diff --git a/vector/src/main/java/im/vector/riotredesign/core/services/EventStreamServiceX.kt b/vector/src/main/java/im/vector/riotredesign/core/services/EventStreamServiceX.kt
index c90a29dcbe..108b27d5de 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/services/EventStreamServiceX.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/services/EventStreamServiceX.kt
@@ -494,7 +494,7 @@ class EventStreamServiceX : VectorService() {
 
             isVideo = sdpValue?.contains("m=video") == true
         } catch (e: Exception) {
-            Timber.e("prepareNotification : getContentAsJsonObject " + e.message, e)
+            Timber.e(e, "prepareNotification : getContentAsJsonObject")
         }
 
         if (!TextUtils.isEmpty(callId)) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt
index 7560185476..36692b7def 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt
@@ -120,7 +120,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver(), KoinComponent {
             }
 
             override fun onNetworkError(e: Exception) {
-                Timber.v("Send message : onNetworkError " + e.message, e)
+                Timber.e(e, "Send message : onNetworkError")
                 onSmartReplyFailed(e.localizedMessage)
             }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 68ccbab6a7..eee04547ec 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -231,7 +231,7 @@ class VectorSettingsAdvancedNotificationPreferenceFragment : VectorPreferenceFra
                                 try {
                                     isEnabled = !TextUtils.equals(actions[0] as String, BingRule.ACTION_DONT_NOTIFY)
                                 } catch (e: Exception) {
-                                    Timber.e("## refreshPreferences failed " + e.message, e)
+                                    Timber.e(e, "## refreshPreferences failed")
                                 }
 
                             }
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
index de68ba6b1e..822c91c8c7 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
@@ -2646,7 +2646,7 @@ if (sharedDataItems.isNotEmpty() && thisActivity != null) {
         val password = passPhraseEditText.text.toString()
         val resource = openResource(appContext, sharedDataItem.uri, sharedDataItem.getMimeType(appContext))
 
-        if(resource?.mContentStream == null) {
+        if (resource?.mContentStream == null) {
             appContext.toast("Error")
 
             return@OnClickListener