diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSource.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSource.java
index 360c94bae9..42a576a2b2 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSource.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSource.java
@@ -24,7 +24,7 @@ import org.springframework.scripting.support.ResourceScriptSource;
 
 /**
  * @author Dave Syer
- * 
+ * @author Oleg Zhurakousky
  * @since 2.0
  * 
  */
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
index ec02aa0243..f20068f233 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
@@ -34,6 +34,8 @@ import org.springframework.scripting.support.ResourceScriptSource;
 
 /**
  * @author Mark Fisher
+ * @author Dave Syer
+ * @author Oleg Zhurakousky
  * @since 2.0
  */
 public class GroovyScriptExecutingMessageProcessorTests {
@@ -112,6 +114,27 @@ public class GroovyScriptExecutingMessageProcessorTests {
 		result = processor.processMessage(message);
 		assertEquals("payload is foo, header is bar", result.toString());
 	}
+	
+	@Test
+	public void testRefreshableScriptExecutionWithAlwaysRefresh() throws Exception {
+		String script = "return \"payload is $payload, header is $headers.testHeader\"";
+		Message<?> message = MessageBuilder.withPayload("foo").setHeader("testHeader", "bar").build();
+		TestResource resource = new TestResource(script, "simpleTest");
+		ScriptSource scriptSource = new RefreshableResourceScriptSource(resource, 0);
+		MessageProcessor<Object> processor = new GroovyScriptExecutingMessageProcessor(scriptSource);
+		// process with the first script
+		Object result = processor.processMessage(message);
+		assertEquals("payload is foo, header is bar", result.toString());
+		// change script, but since refresh-delay is less then 0 we should still se old script executing
+		resource.setScript("return \"payload is $payload\"");
+		// process and see assert that the old script is used
+		result = processor.processMessage(message);
+		assertEquals("payload is foo", result.toString());
+		resource.setScript("return \"payload is 'hello'\"");
+		// process and see assert that the old script is used
+		result = processor.processMessage(message);
+		assertEquals("payload is 'hello'", result.toString());
+	}
 
 
 	private static class TestResource extends AbstractResource {