diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 2035494c..a96fe528 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -103,7 +103,7 @@ class TasksController < ApplicationController
   
   # Shows all tasks, which are already done
   def archive
-    @tasks = Task.done
+    @tasks = Task.done.paginate :page => params[:page], :per_page => 30
   end
   
   # shows workgroup (normal group) to edit weekly_tasks_template
diff --git a/app/models/task.rb b/app/models/task.rb
index 65da3eaf..4e3ffec0 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -21,7 +21,7 @@ class Task < ActiveRecord::Base
   belongs_to :workgroup
 
   named_scope :non_group, :conditions => { :workgroup_id => nil, :done => false }
-  named_scope :done, :conditions => {:done => true}, :order => "due_date ASC"
+  named_scope :done, :conditions => {:done => true}, :order => "due_date DESC"
   named_scope :upcoming, lambda { |*args| {:conditions => ["done = 0 AND due_date = ?", (args.first || 7.days.from_now)]} }
   
   # form will send user in string. responsibilities will added later
diff --git a/app/views/tasks/archive.haml b/app/views/tasks/archive.haml
index 909825f3..4324ade8 100644
--- a/app/views/tasks/archive.haml
+++ b/app/views/tasks/archive.haml
@@ -1,6 +1,8 @@
 - title "Aufgabenarchiv"
 = render :partial => "nav"
 
+= will_paginate @orders
+%br/
 %table{:style => "width: 76%"}
   %tr
     %th Fälligkeitsdatum