diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java
index 655854a2..034a2bca 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java
@@ -58,8 +58,11 @@ public class MvcViewFactoryCreator implements ViewFactoryCreator {
 	}
 
 	public String getViewIdByConvention(String viewStateId) {
-		// TODO - make configurable
-		return viewStateId + ".jsp";
+		if (viewResolvers != null) {
+			return viewStateId;
+		} else {
+			return viewStateId + ".jsp";
+		}
 	}
 
 }
\ No newline at end of file