diff --git a/main.py b/main.py
index 50ec30e1..8858dcc4 100644
--- a/main.py
+++ b/main.py
@@ -115,6 +115,10 @@ class FileServer(webapp.RequestHandler):
 		elif fanfic.format == 'text':
 			self.response.headers['Content-Type'] = 'text/plain'
 			self.response.headers['Content-disposition'] = 'attachment; filename=' +name + '.txt.zip'
+		elif fanfic.format == 'mobi':
+			self.response.headers['Content-Type'] = 'application/x-mobipocket-ebook'
+			self.response.headers['Content-disposition'] = 'attachment; filename=' + name + '.mobi'
+			
 		
 		self.response.out.write(fanfic.blob)