diff --git a/.gitignore b/.gitignore
index 3edb6888c2..81bf98a2c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,4 @@ build/
*.ipr
*.iws
.gradle/
-atlassian-ide-plugin.xml
-/samples
+atlassian-ide-plugin.xml
\ No newline at end of file
diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java
new file mode 100644
index 0000000000..7ec97f157a
--- /dev/null
+++ b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.samples.mvc.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.thymeleaf.spring3.SpringTemplateEngine;
+import org.thymeleaf.spring3.view.ThymeleafViewResolver;
+
+/**
+ * Disable tiles so that we can provide our custom view without being decorated.
+ *
+ * @author Rob Winch
+ *
+ */
+@Configuration
+public class CustomMvcConfig {
+
+ @Bean
+ public ThymeleafViewResolver thymeleafViewResolver(SpringTemplateEngine templateEngine) {
+ ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+ viewResolver.setOrder(Ordered.HIGHEST_PRECEDENCE - 10);
+ viewResolver.setTemplateEngine(templateEngine);
+ return viewResolver;
+ }
+
+}
diff --git a/samples/hellojs-jc/src/main/resources/views/messages/inbox.html b/samples/hellojs-jc/src/main/resources/views/messages/inbox.html
new file mode 100644
index 0000000000..ea986eaf42
--- /dev/null
+++ b/samples/hellojs-jc/src/main/resources/views/messages/inbox.html
@@ -0,0 +1,158 @@
+
+
+ SecureMail
+
+
+
+
+
+
+
+
+
+
+
+
+
+