diff --git a/frontend/document/document.lua b/frontend/document/document.lua
index db86b626e..f63eaf19e 100644
--- a/frontend/document/document.lua
+++ b/frontend/document/document.lua
@@ -36,6 +36,8 @@ local Document = {
 		author = "",
 		date = ""
 	},
+	
+	links = {},
 
 	GAMMA_NO_GAMMA = 1.0,
 
diff --git a/frontend/document/pdfdocument.lua b/frontend/document/pdfdocument.lua
index 2b489d215..bc9d2367c 100644
--- a/frontend/document/pdfdocument.lua
+++ b/frontend/document/pdfdocument.lua
@@ -97,6 +97,21 @@ function PdfDocument:getUsedBBox(pageno)
 	return used
 end
 
+function PdfDocument:getPageLinks(pageno)
+	local hash = "pglinks|"..self.file.."|"..pageno
+	local cached = Cache:check(hash)
+	if cached then
+		return cached.links
+	end
+	local page = self._document:openPage(pageno)
+	local links = page:getPageLinks()
+	Cache:insert(hash, CacheItem:new{ 
+		links = links,
+	})
+	page:close()
+	return links
+end
+
 function PdfDocument:getPageBBox(pageno)
 	return self.koptinterface:getPageBBox(self, pageno)
 end
diff --git a/frontend/ui/reader/readerlink.lua b/frontend/ui/reader/readerlink.lua
index 9b6701680..06c5cada3 100644
--- a/frontend/ui/reader/readerlink.lua
+++ b/frontend/ui/reader/readerlink.lua
@@ -6,7 +6,9 @@ local Device = require("ui/device")
 local Event = require("ui/event")
 local DEBUG = require("dbg")
 
-local ReaderLink = InputContainer:new{}
+local ReaderLink = InputContainer:new{
+	link_states = {}
+}
 
 function ReaderLink:init()
 	if Device:isTouchDevice() then
@@ -27,6 +29,16 @@ function ReaderLink:initGesListener()
 					}
 				}
 			},
+			Swipe = {
+				GestureRange:new{
+					ges = "swipe",
+					range = Geom:new{
+						x = 0, y = 0,
+						w = Screen:getWidth(),
+						h = Screen:getHeight(),
+					}
+				}
+			},
 		}
 	end
 end
@@ -49,22 +61,71 @@ function ReaderLink:onTap(arg, ges)
 			end
 		end
 	end
-	if self.view.links then
-		local pos = self.view:screenToPageTransform(ges.pos)
-		for i = 1, #self.view.links do
-			local link = self.view.links[i]
-			-- enlarge tappable link box
-			local lbox = Geom:new{
-				x = link.start_x - Screen:scaleByDPI(15),
-				y = link.start_y - Screen:scaleByDPI(15),
-				w = link.end_x - link.start_x + Screen:scaleByDPI(30),
-				h = link.end_y - link.start_y > 0 
-				        and link.end_y - link.start_y + Screen:scaleByDPI(30) 
-				        or Screen:scaleByDPI(50),
-			}
-			if inside_box(pos, lbox) then
-				DEBUG("goto link", link)
-				self.document:gotoLink(link.section)
+	local pos = self.view:screenToPageTransform(ges.pos)
+	if self.ui.document.info.has_pages then
+		local page_links = self.ui.document:getPageLinks(pos.page)
+		--DEBUG("page links", page_links)
+		if page_links then
+			for i = 1, #page_links do
+				local link = page_links[i]
+				-- enlarge tappable link box
+				local lbox = Geom:new{
+					x = link.x0 - Screen:scaleByDPI(15),
+					y = link.y0 - Screen:scaleByDPI(15),
+					w = link.x1 - link.x0 + Screen:scaleByDPI(30),
+					h = link.y1 - link.y0 + Screen:scaleByDPI(30)
+				}
+				if inside_box(pos, lbox) and link.page then
+					return self:onGotoLink(link)
+				end
+			end
+		end
+	else
+		if self.view.links then
+			for i = 1, #self.view.links do
+				local link = self.view.links[i]
+				-- enlarge tappable link box
+				local lbox = Geom:new{
+					x = link.start_x - Screen:scaleByDPI(15),
+					y = link.start_y - Screen:scaleByDPI(15),
+					w = link.end_x - link.start_x + Screen:scaleByDPI(30),
+					h = link.end_y - link.start_y > 0 
+					        and link.end_y - link.start_y + Screen:scaleByDPI(30) 
+					        or Screen:scaleByDPI(50),
+				}
+				if inside_box(pos, lbox) then
+					return self:onGotoLink(link)
+				end
+			end
+		end
+	end
+end
+
+function ReaderLink:onGotoLink(link)
+	DEBUG("goto link", link)
+	if self.ui.document.info.has_pages then
+		table.insert(self.link_states, self.view.state.page)
+		self.ui:handleEvent(Event:new("PageUpdate", link.page + 1))
+	else
+		table.insert(self.link_states, self.ui.document:getXPointer())
+		self.document:gotoLink(link.section)
+		self.ui:handleEvent(Event:new("UpdateXPointer"))
+	end
+	return true
+end
+
+function ReaderLink:onSwipe(arg, ges)
+	if ges.direction == "east" then
+		if self.ui.document.info.has_pages then
+			local last_page = table.remove(self.link_states)
+			if last_page then
+				self.ui:handleEvent(Event:new("PageUpdate", last_page))
+				return true
+			end
+		else
+			local last_xp = table.remove(self.link_states)
+			if last_xp then
+				self.ui.document:gotoXPointer(last_xp)
 				self.ui:handleEvent(Event:new("UpdateXPointer"))
 				return true
 			end
diff --git a/frontend/ui/reader/readerrolling.lua b/frontend/ui/reader/readerrolling.lua
index 5debdfd5d..527b565d3 100644
--- a/frontend/ui/reader/readerrolling.lua
+++ b/frontend/ui/reader/readerrolling.lua
@@ -183,16 +183,10 @@ function ReaderRolling:onTapBackward()
 end
 
 function ReaderRolling:onSwipe(arg, ges)
-	if ges.direction == "north" then
+	if ges.direction == "west" or ges.direction == "north" then
 		self:onGotoViewRel(1)
-	elseif ges.direction == "south" then
+	elseif ges.direction == "east" or ges.direction == "south" then
 		self:onGotoViewRel(-1)
-	elseif ges.direction == "west" then
-		self.ui.document:goForward()
-		self:onUpdateXPointer()
-	elseif ges.direction == "east" then
-		self.ui.document:goBack()
-		self:onUpdateXPointer()
 	end
 	return true
 end