diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html
index 745d4fc87025c..7659432fc567c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_group.php.html
@@ -2,7 +2,7 @@
 
 <div>
     <?php foreach ($field->getVisibleFields() as $child): ?>
-        <?php echo $view['form']->render($child, array(), array(), 'FrameworkBundle:Form:field_row.php') ?>
+        <?php echo $view['form']->render($child, array(), array(), 'FrameworkBundle:Form:field_row.php.html') ?>
     <?php endforeach; ?>
 </div>
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html
index 1e546a8de4666..6b2c448fa4295 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.php.html
@@ -1,4 +1,4 @@
 <?php echo str_replace('{{ widget }}',
-    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php'),
+    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html'),
     $field->getPattern()
 ) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html
index 7a65a9470b64f..14b02df9d0356 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.php.html
@@ -1 +1 @@
-<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php') ?> %
+<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html') ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index fd6dbdc0501ac..2dc232c9574c3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -6,6 +6,7 @@
 use Symfony\Component\Templating\Engine;
 use Symfony\Component\Form\FieldInterface;
 use Symfony\Component\Form\FieldGroupInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
 
 /*
  * This file is part of the Symfony framework.
@@ -28,7 +29,8 @@ class FormHelper extends Helper
 
     protected $engine;
 
-    public function __construct(Engine $engine)
+
+    public function __construct(DelegatingEngine $engine)
     {
         $this->engine = $engine;
     }
@@ -109,7 +111,7 @@ public function render(/*FieldInterface */$field, array $attributes = array(), a
     public function label(/*FieldInterface */$field, $label = false, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:label.php';
+            $template = 'FrameworkBundle:Form:label.php.html';
         }
 
         return $this->engine->render($template, array(
@@ -122,7 +124,7 @@ public function label(/*FieldInterface */$field, $label = false, array $paramete
     public function errors(/*FieldInterface */$field, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:errors.php';
+            $template = 'FrameworkBundle:Form:errors.php.html';
         }
 
         return $this->engine->render($template, array(
@@ -134,7 +136,7 @@ public function errors(/*FieldInterface */$field, array $parameters = array(), $
     public function hidden(/*FieldGroupInterface */$group, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:hidden.php';
+            $template = 'FrameworkBundle:Form:hidden.php.html';
         }
 
         return $this->engine->render($template, array(
@@ -161,7 +163,7 @@ protected function lookupTemplate(/*FieldInterface */$field)
 
             $underscoredName = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($className, '_', '.')));
 
-            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php')) {
+            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php.html')) {
                 $template = $guess;
             }
 
@@ -169,7 +171,7 @@ protected function lookupTemplate(/*FieldInterface */$field)
         } while (null === $template && false !== $currentFqClassName);
 
         if (null === $template && $field instanceof FieldGroupInterface) {
-            $template = 'FrameworkBundle:Form:field_group.php';
+            $template = 'FrameworkBundle:Form:field_group.php.html';
         }
 
         self::$cache[$fqClassName] = $template;