diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java
index 910b2e76..6c8f3d7b 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java
@@ -31,7 +31,7 @@ public class FlowPropertyResolver extends ELDelegatingPropertyResolver {
 	private static final CompositeELResolver composite = new CompositeELResolver();
 
 	static {
-		composite.add(new FlowMessageSourceResolver());
+		composite.add(new FlowResourceELResolver());
 		composite.add(new MapAdaptableELResolver());
 	}
 
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowMessageSourceResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResourceELResolver.java
similarity index 89%
rename from spring-faces/src/main/java/org/springframework/faces/webflow/FlowMessageSourceResolver.java
rename to spring-faces/src/main/java/org/springframework/faces/webflow/FlowResourceELResolver.java
index c2b7f2be..ab97070b 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowMessageSourceResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResourceELResolver.java
@@ -5,13 +5,12 @@ import java.util.Iterator;
 import javax.el.ELContext;
 import javax.el.ELResolver;
 import javax.el.PropertyNotWritableException;
-import javax.faces.context.FacesContext;
 
 import org.springframework.context.MessageSource;
 import org.springframework.util.StringUtils;
 import org.springframework.webflow.execution.RequestContextHolder;
 
-public class FlowMessageSourceResolver extends ELResolver {
+public class FlowResourceELResolver extends ELResolver {
 
 	private String MESSAGE_SOURCE_KEY = "resourceBundle";
 
@@ -29,8 +28,8 @@ public class FlowMessageSourceResolver extends ELResolver {
 			return MessageSource.class;
 		} else if (base != null && base instanceof MessageSource) {
 			MessageSource messageSource = (MessageSource) base;
-			String message = messageSource.getMessage(property.toString(), null, FacesContext.getCurrentInstance()
-					.getViewRoot().getLocale());
+			String message = messageSource.getMessage(property.toString(), null, RequestContextHolder
+					.getRequestContext().getExternalContext().getLocale());
 			if (StringUtils.hasText(message)) {
 				context.setPropertyResolved(true);
 				return String.class;
@@ -45,8 +44,8 @@ public class FlowMessageSourceResolver extends ELResolver {
 			return RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext();
 		} else if (base != null && base instanceof MessageSource) {
 			MessageSource messageSource = (MessageSource) base;
-			String message = messageSource.getMessage(property.toString(), null, FacesContext.getCurrentInstance()
-					.getViewRoot().getLocale());
+			String message = messageSource.getMessage(property.toString(), null, RequestContextHolder
+					.getRequestContext().getExternalContext().getLocale());
 			if (StringUtils.hasText(message)) {
 				context.setPropertyResolved(true);
 				return message;
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java
index 96226737..6b8b780d 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java
@@ -35,7 +35,7 @@ public class FlowVariableResolver extends ELDelegatingVariableResolver {
 	static {
 		composite.add(new RequestContextELResolver());
 		composite.add(new ImplicitFlowVariableELResolver());
-		composite.add(new FlowMessageSourceResolver());
+		composite.add(new FlowResourceELResolver());
 		composite.add(new ScopeSearchingELResolver());
 	}