diff --git a/module/task/control.php b/module/task/control.php
index 396f878da5..0fe10c509b 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -211,6 +211,7 @@ class task extends control
         $this->view->position[]    = $this->lang->task->edit;
         $this->view->stories       = $this->story->getProjectStoryPairs($this->view->project->id);
         $this->view->members       = $this->loadModel('user')->appendDeleted($this->view->members, $this->view->task->assignedTo);        
+        $this->view->modules       = $this->tree->getOptionMenu($this->view->task->project, $viewType = 'task');
         $this->display();
     }
 
@@ -350,13 +351,14 @@ class task extends control
         $position[]      = html::a($this->createLink('project', 'browse', "projectID=$task->project"), $project->name);
         $position[]      = $task->name;
 
-        $this->view->header     = $header;
-        $this->view->position   = $position;
-        $this->view->project    = $project;
-        $this->view->task       = $task;
-        $this->view->actions    = $this->loadModel('action')->getList('task', $taskID);
-        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->preAndNext = $this->loadModel('common')->getPreAndNextObject('task', $taskID);
+        $this->view->header      = $header;
+        $this->view->position    = $position;
+        $this->view->project     = $project;
+        $this->view->task        = $task;
+        $this->view->actions     = $this->loadModel('action')->getList('task', $taskID);
+        $this->view->users       = $this->loadModel('user')->getPairs('noletter');
+        $this->view->preAndNext  = $this->loadModel('common')->getPreAndNextObject('task', $taskID);
+        $this->view->modulePath  = $this->tree->getParents($task->module);
         $this->display();
     }
 
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 080f9d2e92..52973f37f3 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -40,7 +40,7 @@ $(function()
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->module;?></th>
-      <td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID);?></span></td>
+      <td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='select-3'");?></span></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index ce077a9f9a..fdbe8370e3 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -53,6 +53,10 @@
             <th class='rowhead w-p20'><?php echo $lang->task->project;?></th>
             <td><?php echo $project->name;?></td>
           </tr>  
+          <tr>
+            <th class='rowhead w-p20'><?php echo $lang->task->module;?></th>
+            <td><?php echo html::select('module', $modules, $task->module, 'class="select-1"');?></td>
+          </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->story;?></th>
             <td><?php echo html::select('story', $stories, $task->story, 'class=select-1');?></td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index a2b57089c3..c8f0062685 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -78,6 +78,18 @@
             <th class='rowhead w-p20'><?php echo $lang->task->project;?></th>
             <td><?php if(!common::printLink('project', 'task', "projectID=$task->project", $project->name)) echo $project->name;?></td>
           </tr>  
+          <tr>
+            <th class='rowhead w-p20'><?php echo $lang->task->module;?></th>
+            <td>
+              <?php
+              foreach($modulePath as $key => $module)
+              {
+                  if(!common::printLink('project', 'task', "projectID=$task->project&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                  if(isset($modulePath[$key + 1])) echo $lang->arrow;
+              }
+              ?>
+            </td>
+          </tr>  
           <tr class='nofixed'>
             <th class='rowhead'><?php echo $lang->task->story;?></th>
             <td>