diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
index 29d49f967e..6899bf1ce3 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
@@ -294,7 +294,11 @@ abstract class VectorBaseActivity : BaseMvRxActivity() {
      * ========================================================================================== */
 
     fun notImplemented(message: String = "") {
-        toast(getString(R.string.not_implemented) + message.takeIf { message.isNotBlank() }?.let { ": $it" })
+        if (message.isNotBlank()) {
+            toast(getString(R.string.not_implemented) + ": $message")
+        } else {
+            toast(getString(R.string.not_implemented))
+        }
     }
 
 }
\ No newline at end of file