diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index f43acf74e9..9c791f205f 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <include layout="@layout/view_user_selection" />
+                <include layout="@layout/view_mention_candidate_selection" />
 
                 <FrameLayout
                     android:layout_width="match_parent"
diff --git a/res/layout/view_user_selection.xml b/res/layout/view_mention_candidate_selection.xml
similarity index 100%
rename from res/layout/view_user_selection.xml
rename to res/layout/view_mention_candidate_selection.xml