diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index 6ee554db8c3..429b2d4e2ca 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -25,5 +25,6 @@
+
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt
new file mode 100644
index 00000000000..815a9bad0ee
--- /dev/null
+++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * 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.
+ */
+
+package org.jetbrains.jet.plugin.android
+
+import org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension
+import org.jetbrains.jet.plugin.references.JetSimpleNameReference
+import com.intellij.psi.PsiElement
+import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
+import org.jetbrains.android.dom.wrappers.ValueResourceElementWrapper
+import org.jetbrains.jet.lang.psi.JetProperty
+import com.intellij.psi.impl.light.LightElement
+import org.jetbrains.jet.lang.psi.JetPsiFactory
+
+public class AndroidKotlinIsReferenceToExtension : KotlinIsReferenceToExtension {
+ override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? {
+ val resolvedElement = reference.resolve()
+ if (resolvedElement == null) {
+ return false
+ }
+ if (isAndroidSyntheticElement(resolvedElement)) {
+ if (element is ValueResourceElementWrapper) {
+ val resource = element.getValue()!!
+ return (resolvedElement as JetProperty).getName() == resource.substring(resource.indexOf('/') + 1)
+ }
+ }
+ else if (resolvedElement is LightElement && element is JetProperty) {
+ return resolvedElement.getName() == element.getName()
+ }
+ return null
+ }
+
+ override fun handleElementRename(reference: JetSimpleNameReference, psiFactory: JetPsiFactory, newElementName: String): PsiElement? {
+ return if (newElementName.startsWith("@+id/"))
+ psiFactory.createNameIdentifier(newElementName.substring(newElementName.indexOf('/') + 1))
+ else
+ null
+ }
+}
\ No newline at end of file