diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
index 613136a1bd3..70c1c6632b0 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
@@ -91,6 +91,18 @@ public class QuickFixFactoryForTypeMismatchError implements JetIntentionActionsF
             }
         }
 
+        // Change function return type when TYPE_MISMATCH is reported on call expression:
+        if (expression instanceof JetCallExpression) {
+            ResolvedCall<? extends CallableDescriptor> resolvedCall =
+                    context.get(BindingContext.RESOLVED_CALL, ((JetCallExpression) expression).getCalleeExpression());
+            if (resolvedCall != null) {
+                PsiElement declaration = BindingContextUtils.descriptorToDeclaration(context, resolvedCall.getResultingDescriptor());
+                if (declaration instanceof JetFunction) {
+                    actions.add(new ChangeFunctionReturnTypeFix((JetFunction) declaration, expectedType));
+                }
+            }
+        }
+
         // Change type of a function parameter in case TYPE_MISMATCH is reported on expression passed as value argument of call.
         // 1) When an argument is a dangling function literal:
         JetFunctionLiteralExpression functionLiteralExpression =
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt b/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
new file mode 100644
index 00000000000..e043c28dd7b
--- /dev/null
+++ b/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
@@ -0,0 +1,3 @@
+// "Change 'bar' function return type to 'String'" "true"
+fun bar(): String = ""
+fun foo(): String = bar(<caret>)
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
new file mode 100644
index 00000000000..dcd7a090c5b
--- /dev/null
+++ b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
@@ -0,0 +1,3 @@
+// "Change 'bar' function return type to 'String'" "true"
+fun bar(): Any = ""
+fun foo(): String = bar(<caret>)
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index a4eb2f2f42a..a7a0898cffe 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -1251,6 +1251,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest("idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt");
         }
         
+        @TestMetadata("beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt")
+        public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCall() throws Exception {
+            doTest("idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt");
+        }
+        
         @TestMetadata("beforeChangeReturnTypeWhenFunctionNameIsMissing.kt")
         public void testChangeReturnTypeWhenFunctionNameIsMissing() throws Exception {
             doTest("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt");