diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index fc3b9eeebd7..89dadb6a2e9 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="Kotlin">
     <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main"
-              name="main" toReformat="true" toShortenFQNames="true" value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
+              name="main" toReformat="true" toShortenFQNames="true"
+              value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
             <option name="KOTLIN_NAMESPACE" value="true" />
         </context>
@@ -21,7 +22,8 @@
         </context>
     </template>
     <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutv"
-              name="soutv" toReformat="true" toShortenFQNames="true" value="println(&quot;$EXPR_COPY$ = $DOLLAR${$EXPR$}&quot;)">
+              name="soutv" toReformat="true" toShortenFQNames="true"
+              value="println(&quot;$EXPR_COPY$ = $DOLLAR${$EXPR$}&quot;)">
         <variable alwaysStopAt="false" defaultValue="&quot;$&quot;" expression="" name="DOLLAR" />
         <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="kotlinVariableOfType(&quot;&quot;)" name="EXPR" />
         <variable alwaysStopAt="false" defaultValue="" expression="EXPR" name="EXPR_COPY" />
@@ -31,7 +33,8 @@
     </template>
     <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.soutp"
               name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
-        <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())" name="FORMAT" />
+        <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
+                  name="FORMAT" />
         <context>
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
@@ -58,7 +61,8 @@
         </context>
     </template>
     <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun1"
-              name="fun1" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
+              name="fun1" toReformat="true" toShortenFQNames="true"
+              value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM1" />
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="PARAM1TYPE" />
@@ -70,7 +74,8 @@
         </context>
     </template>
     <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.fun2"
-              name="fun2" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
+              name="fun2" toReformat="true" toShortenFQNames="true"
+              value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM1" />
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="PARAM1TYPE" />
@@ -112,4 +117,39 @@
             <option name="KOTLIN_EXPRESSION" value="true"/>
         </context>
     </template>
+
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exfun"
+              name="exfun" toReformat="true" toShortenFQNames="true"
+              value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
+        <variable alwaysStopAt="true" defaultValue="&quot;f&quot;" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
+        <context>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exval"
+              name="exval" toReformat="true" toShortenFQNames="true"
+              value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
+        <variable alwaysStopAt="true" defaultValue="&quot;v&quot;" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="TYPE" />
+        <context>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.exvar"
+              name="exvar" toReformat="true" toShortenFQNames="true"
+              value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
+        <variable alwaysStopAt="true" defaultValue="&quot;v&quot;" expression="" name="NAME" />
+        <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="TYPE" />
+        <context>
+            <option name="KOTLIN_CLASS" value="true"/>
+            <option name="KOTLIN_NAMESPACE" value="true"/>
+        </context>
+    </template>
 </templateSet>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index e30086a1294..e8ad0f8fa69 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -36,5 +36,8 @@ livetemplate.description.fun2=Function with two parameters
 livetemplate.description.interface=Trait
 livetemplate.description.singleton=Singleton
 livetemplate.description.closure=Closure (function without name)
+livetemplate.description.exfun=Extension function
+livetemplate.description.exval=Extension read-only property
+livetemplate.description.exvar=Extension read-write property
 macro.variable.of.type=kotlinVariableOfType(Type)
 macro.fun.parameters=functionParameters()
\ No newline at end of file