--- a/gpp/messages/urls.py	Sun May 01 02:11:48 2011 +0000
+++ b/gpp/messages/urls.py	Tue May 03 02:56:58 2011 +0000
@@ -1,59 +1,35 @@
 """urls for the Messages application"""
 from django.conf.urls.defaults import *
-from django.views.generic import RedirectView
-
 
 urlpatterns = patterns('messages.views',
-    url(r'^inbox/$', 'inbox', name='messages-inbox'),
-    url(r'^outbox/$', 'outbox', name='messages-outbox'),
-    url(r'^trash/$', 'trash', name='messages-trash'),
-    url(r'^view/(\d+)/$', 'view', name='messages-view'),
-    url(r'^reply/(\d+)/$', 'reply', name='messages-reply'),
-    url(r'^compose/$', 'compose', name='messages-compose'),
-    url(r'^compose/([\w.@+-]{1,30})/$', 'compose', name='messages-compose_to'),
-    url(r'^delete/$', 'delete_bulk', name='messages-delete_bulk'),
-    url(r'^delete/(\d+)/$', 'delete', name='messages-delete'),
-    url(r'^undelete/$', 'undelete_bulk', name='messages-undelete_bulk'),
-    url(r'^undelete/(\d+)/$', 'undelete', name='messages-undelete'),
-    url(r'^options/$', 'options', name='messages-options'),
+    url(r'^$',
+        'index',
+        name='messages-index'),
+    url(r'^(inbox|compose|outbox|trash|options)/$',
+        'index',
+        name='messages-index_named'),
+    url(r'^compose/([\w.@+-]{1,30})/$', 
+        'compose_to', 
+        name='messages-compose_to'),
+    url(r'^inbox-tab/$',
+        'inbox',
+        name='messages-inbox'),
+    url(r'^outbox-tab/$',
+        'outbox',
+        name='messages-outbox'),
+    url(r'^trash-tab/$',
+        'trash',
+        name='messages-trash'),
+    url(r'^message/$',
+        'message',
+        name='messages-message'),
+    url(r'^options-tab/$',
+        'options',
+        name='messages-options'),
+    url(r'^compose-tab/$',
+        'compose',
+        name='messages-compose'),
+    url(r'^bulk/$',
+        'bulk',
+        name='messages-bulk'),
 )
-
-urlpatterns += patterns('',
-    (r'^$', RedirectView.as_view(url='inbox/')),
-)
-
-urlpatterns += patterns('messages.views2',
-    url(r'^beta/$',
-        'index',
-        name='messages-beta_index'),
-    url(r'^beta/(inbox|compose|outbox|trash|options)/$',
-        'index',
-        name='messages-beta_index_named'),
-    url(r'^beta/compose/([\w.@+-]{1,30})/$', 
-        'compose_to', 
-        name='messages-beta_compose_to'),
-    url(r'^beta/inbox-tab/$',
-        'inbox',
-        name='messages-beta_inbox'),
-    url(r'^beta/outbox-tab/$',
-        'outbox',
-        name='messages-beta_outbox'),
-    url(r'^beta/trash-tab/$',
-        'trash',
-        name='messages-beta_trash'),
-    url(r'^beta/message/$',
-        'message',
-        name='messages-beta_message'),
-    url(r'^beta/options-tab/$',
-        'options',
-        name='messages-beta_options'),
-    url(r'^beta/compose-tab/$',
-        'compose',
-        name='messages-beta_compose'),
-    url(r'^beta/compose-tab/([\w.@+-]{1,30})/$',
-        'compose',
-        name='messages-beta_compose_to'),
-    url(r'^beta/bulk/$',
-        'bulk',
-        name='messages-beta_bulk'),
-)