Index: trunk/core/units/general/main_event_handler.php
===================================================================
diff -u -N -r6428 -r8397
--- trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 6428)
+++ trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 8397)
@@ -82,9 +82,14 @@
 				}
 				$ret .= $theme_name.'/';
 			}
-
+			
 			if ($processed_params['m_cat_id'] > 0 && isset($url_params['pass_category']) && $url_params['pass_category']) {
-				$ret .= $this->Application->getFilename('c', $processed_params['m_cat_id']).'/';
+				$category_filename = $this->Application->getFilename('c', $processed_params['m_cat_id']);
+				$t = isset($url_params['t']) && $url_params['t'] ? $url_params['t'] : false;
+				// category name doesn't match template name -> Proj-CMS/In-Edit tricks
+				if (!preg_match('/Content\/'.preg_quote($t, '/').'/i', $category_filename)) {
+					$ret .= $category_filename.'/';
+				}
 				$url_params['category_processed'] = true;
 			}
 			else {