diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index cdba5b2ef2..79021902c4 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -177,7 +177,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Timber.i("onCreate Activity ${this.javaClass.simpleName}")
+        Timber.i("onCreate Activity ${javaClass.simpleName}")
         val vectorComponent = getVectorComponent()
         screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
         val timeForInjection = measureTimeMillis {
@@ -305,7 +305,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onDestroy() {
         super.onDestroy()
-        Timber.i("onDestroy Activity ${this.javaClass.simpleName}")
+        Timber.i("onDestroy Activity ${javaClass.simpleName}")
         unBinder?.unbind()
         unBinder = null
 
@@ -333,7 +333,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Activity ${this.javaClass.simpleName}")
+        Timber.i("onResume Activity ${javaClass.simpleName}")
 
         configurationViewModel.onActivityResumed()
 
@@ -373,7 +373,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onPause() {
         super.onPause()
-        Timber.i("onPause Activity ${this.javaClass.simpleName}")
+        Timber.i("onPause Activity ${javaClass.simpleName}")
 
         rageShake.stop()
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 9f4924ebb2..4a251de1a3 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -141,7 +141,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume BottomSheet ${this.javaClass.simpleName}")
+        Timber.i("onResume BottomSheet ${javaClass.simpleName}")
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index f221c29215..179e21a6d8 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -112,7 +112,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     }
 
     final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        Timber.i("onCreateView Fragment ${this.javaClass.simpleName}")
+        Timber.i("onCreateView Fragment ${javaClass.simpleName}")
         return inflater.inflate(getLayoutResId(), container, false)
     }
 
@@ -122,7 +122,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     @CallSuper
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Fragment ${this.javaClass.simpleName}")
+        Timber.i("onResume Fragment ${javaClass.simpleName}")
     }
 
     @CallSuper
@@ -142,7 +142,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     @CallSuper
     override fun onDestroyView() {
         super.onDestroyView()
-        Timber.i("onDestroyView Fragment ${this.javaClass.simpleName}")
+        Timber.i("onDestroyView Fragment ${javaClass.simpleName}")
         mUnBinder?.unbind()
         mUnBinder = null
         uiDisposables.clear()
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 74f4c7148f..9302be502d 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -74,7 +74,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Timber.i("onCreate Activity ${this.javaClass.simpleName}")
+        Timber.i("onCreate Activity ${javaClass.simpleName}")
         val vectorComponent = getVectorComponent()
         screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
         val timeForInjection = measureTimeMillis {
@@ -154,6 +154,16 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
         window.navigationBarColor = ContextCompat.getColor(this, R.color.black_alpha)
     }
 
+    override fun onResume() {
+        super.onResume()
+        Timber.i("onResume Activity ${javaClass.simpleName}")
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Timber.i("onPause Activity ${javaClass.simpleName}")
+    }
+
     private fun getOtherThemes() = ActivityOtherThemes.VectorAttachmentsPreview
 
     override fun shouldAnimateDismiss(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
index 512545afe2..add6fba38c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
@@ -70,7 +70,7 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScree
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Fragment ${this.javaClass.simpleName}")
+        Timber.i("onResume Fragment ${javaClass.simpleName}")
         vectorActivity.supportActionBar?.setTitle(titleRes)
         // find the view from parent activity
         mLoadingView = vectorActivity.findViewById(R.id.vector_settings_spinner_views)