diff --git a/src/org/geometerplus/android/fbreader/api/Api.java b/src/org/geometerplus/android/fbreader/api/Api.java
index 6bf05f229..c1924e947 100644
--- a/src/org/geometerplus/android/fbreader/api/Api.java
+++ b/src/org/geometerplus/android/fbreader/api/Api.java
@@ -89,6 +89,6 @@ public interface Api {
 	String getTapActionByCoordinates(String name, int x, int y, int width, int height, String tap) throws ApiException;
 
 	List<MenuNode> getMainMenuContent() throws ApiException;
-	String getResourceString(String ... keys) throws ApiException; 
+	String getResourceString(String ... keys) throws ApiException;
 	Bitmap getBitmap(int resourceId) throws ApiException;
 }
diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
index cd4c3d563..369a573dc 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
+++ b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
@@ -1043,7 +1043,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 		cursor.close();
 		return links;
 	}
-	
+
 	private SQLiteStatement mySaveProgessStatement;
 	@Override
 	protected void saveBookProgress(long bookId, RationalNumber progress) {
@@ -1489,7 +1489,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (2, '', 245*256*256 + 121*256 + 0)"); // #f57900
 		myDatabase.execSQL("INSERT OR REPLACE INTO HighlightingStyle (style_id, name, bg_color) VALUES (3, '', 114*256*256 + 159*256 + 207)"); // #729fcf
 	}
-	
+
 	private void updateTables25() {
 		myDatabase.execSQL(
 			"CREATE TABLE IF NOT EXISTS BookReadingProgress(" +
@@ -1497,7 +1497,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 				"numerator INTEGER NOT NULL," +
 				"denominator INTEGER NOT NULL)");
 	}
-	
+
 	private void updateTables26() {
 		myDatabase.execSQL(
 			"CREATE TABLE IF NOT EXISTS BookSynchronizationInfo(" +
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java b/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
index d87454d21..8f7f688fe 100644
--- a/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
@@ -36,7 +36,7 @@ import org.geometerplus.fbreader.network.tree.NetworkItemsLoader;
 public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNetworkLink {
 	private final String myPredefinedId;
 	private final Map<String,String> myExtraData = new HashMap<String,String>();
-	
+
 	public RSSNetworkLink(
 		int id, String predefinedId,
 		String siteName, String title, String summary,
@@ -45,12 +45,12 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
 		super(id, siteName, title, summary, language, infos);
 		myPredefinedId = predefinedId;
 	}
-	
+
 	ZLNetworkRequest createNetworkData(String url, final RSSCatalogItem.State result) {
 		if (url == null) {
 			return null;
 		}
-		
+
 		final NetworkLibrary library = NetworkLibrary.Instance();
 		final NetworkCatalogItem catalogItem = result.Loader.getTree().Item;
 		library.startLoading(catalogItem);
@@ -64,7 +64,7 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
 				}
 
 				new RSSXMLReader(new RSSChannelHandler(getURL(), result), false).read(inputStream);
-				
+
 				if (result.Loader.confirmInterruption() && result.LastLoadedId != null) {
 					result.LastLoadedId = null;
 				} else {
@@ -83,7 +83,7 @@ public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNe
 	public RSSCatalogItem.State createOperationData(NetworkItemsLoader loader) {
 		return new RSSCatalogItem.State(this, loader);
 	}
-	
+
 	public final void setExtraData(Map<String,String> extraData) {
 		myExtraData.clear();
 		myExtraData.putAll(extraData);
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java b/src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
index fdbc55c65..bf28a305a 100644
--- a/src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
+++ b/src/org/geometerplus/fbreader/network/rss/RSSXMLReader.java
@@ -27,12 +27,12 @@ import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
 import org.geometerplus.fbreader.network.atom.*;
 
 public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType extends RSSItem> extends ZLXMLReaderAdapter {
-	
+
 	public RSSXMLReader(ATOMFeedHandler<MetadataType,EntryType> handler, boolean readEntryNotFeed) {
 		myFeedHandler = handler;
 		myState = START;
 	}
-	
+
 	protected int myState;
 	private final ATOMFeedHandler<MetadataType,EntryType> myFeedHandler;
 	private Map<String,String> myNamespaceMap;
@@ -42,7 +42,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 	private RSSAuthor myAuthor;
 	private RSSCategory myCategory;
 	private ATOMId myId;
-	
+
 	private static final int START = 0;
 	protected static final int RSS = 1;
 	protected static final int CHANNEL = 2;
@@ -58,7 +58,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 	protected static final int DESCRIPTION = 12;
 	protected static final int CONTENT = 13;
 	protected static final int COMMENTS_RSS = 14;
-	
+
 	protected static final String TAG_RSS = "rss";
 	protected static final String TAG_CHANNEL = "channel";
 	protected static final String TAG_ITEM = "item";
@@ -68,7 +68,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 	protected static final String TAG_GUID = "guid";
 	protected static final String TAG_DESCRIPTION = "description";
 	protected static final String TAG_PUBDATE = "pubDate";
-	
+
 	@Override
 	public final boolean startElementHandler(String tag, ZLStringMap attributes) {
 		final int index = tag.indexOf(':');
@@ -80,7 +80,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 			tagPrefix = "";
 			tag = tag.intern();
 		}
-		
+
 		return startElementHandler(getNamespace(tagPrefix), tag, attributes, extractBufferContent());
 	}
 
@@ -97,12 +97,12 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 		}
 		return endElementHandler(getNamespace(tagPrefix), tag, extractBufferContent());
 	}
-	
+
 	@Override
 	public final void characterDataHandler(char[] data, int start, int length) {
 		myBuffer.append(data, start, length);
 	}
-	
+
 	public boolean startElementHandler(String ns, String tag, ZLStringMap attributes, String bufferContent) {
 		switch (myState) {
 			case START:
@@ -119,7 +119,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 				if (testTag(TAG_TITLE, tag, ns, null)) {
 					myState = C_TITLE;
 				}
-				if (testTag(TAG_LINK, tag, ns, null)) {				
+				if (testTag(TAG_LINK, tag, ns, null)) {
 					myState = C_LINK;
 				}
 				if (testTag(TAG_ITEM, tag, ns, null)) {
@@ -151,7 +151,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 		}
 		return false;
 	}
-	
+
 	public boolean endElementHandler(String ns, String tag, String bufferContent) {
 		switch (myState) {
 			case START:
@@ -172,7 +172,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 				}
 				break;
 			case C_LINK:
-				if (testTag(TAG_LINK, tag, ns, null)) {				
+				if (testTag(TAG_LINK, tag, ns, null)) {
 					myState = CHANNEL;
 				}
 				break;
@@ -233,11 +233,11 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 		}
 		return false;
 	}
-	
+
 	private void parseTitle(String bufferContent) {
 		String[] marks = {"~ by:", "By"};
 		boolean found = false;
-		
+
 		for (int i = 0; i < marks.length; i++) {
 			int foundIndex = bufferContent.indexOf(marks[i]);
 			if (foundIndex >= 0) {
@@ -253,42 +253,42 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 				break;
 			}
 		}
-		
+
 		if (!found) {
 			myItem.Title = bufferContent;
 		}
 	}
-	
+
 	private String makeFormat(String buffer) {
 		//TODO: maybe need to make the text more readable?
 		StringBuffer s1 = new StringBuffer(buffer);
 		int index;
 		String[] marks = {"Author:", "Price:", "Rating:"};
-		
+
 		for (int i = 0; i < marks.length; i++) {
 			index = s1.indexOf(marks[i]);
 			if (index >= 0) {
 				s1.insert(index, "<br/>");
 			}
 		}
-		
+
 		return s1.toString();
 	}
-	
+
 	public boolean testTag(String name, String tag, String ns, String nsName) {
 		return name == tag && ns == nsName;
 	}
-	
+
 	@Override
 	public final boolean processNamespaces() {
 		return true;
 	}
-	
+
 	@Override
 	public final void namespaceMapChangedHandler(Map<String,String> namespaceMap) {
 		myNamespaceMap = namespaceMap;
 	}
-	
+
 	protected final String getNamespace(String prefix) {
 		if (myNamespaceMap == null) {
 			return null;
@@ -296,7 +296,7 @@ public class RSSXMLReader<MetadataType extends RSSChannelMetadata,EntryType exte
 		final String ns = myNamespaceMap.get(prefix);
 		return ns != null ? ns.intern() : null;
 	}
-	
+
 	private final String extractBufferContent() {
 		final char[] bufferContentArray = myBuffer.toString().toCharArray();
 		myBuffer.delete(0, myBuffer.length());
diff --git a/src/org/geometerplus/fbreader/sort/TitledEntity.java b/src/org/geometerplus/fbreader/sort/TitledEntity.java
index a25b70ecc..750506341 100644
--- a/src/org/geometerplus/fbreader/sort/TitledEntity.java
+++ b/src/org/geometerplus/fbreader/sort/TitledEntity.java
@@ -29,11 +29,11 @@ import android.os.Build;
 public abstract class TitledEntity {
 	private String myTitle;
 	private String mySortKey;
-	
+
 	public TitledEntity(String title) {
 		myTitle = title;
 	}
-	
+
 	public String getTitle() {
 		return myTitle != null ? myTitle : "";
 	}
@@ -50,9 +50,9 @@ public abstract class TitledEntity {
 	protected void resetSortKey() {
 		mySortKey = null;
 	}
-	
+
 	public abstract String getLanguage();
-	
+
 	public String getSortKey() {
 		if (null == mySortKey) {
 			try {
@@ -63,7 +63,7 @@ public abstract class TitledEntity {
 		}
 		return mySortKey;
 	}
-	
+
 	private final static Map<String, String[]> ARTICLES = new HashMap<String, String[]>();
 	// English articles
 	private final static String[] EN_ARTICLES = new String[] {
@@ -88,7 +88,7 @@ public abstract class TitledEntity {
 	private final static String[] SP_ARTICLES = new String[] {
 		"el ", "la ", "los ", "las ", "un ", "unos ", "una ", "unas "
 	};
-	
+
 	static {
 		ARTICLES.put("en", EN_ARTICLES);
 		ARTICLES.put("fr", FR_ARTICLES);
@@ -148,7 +148,7 @@ public abstract class TitledEntity {
 		if (result.startsWith("a is")) {
 			return result;
 		}
-		
+
 		if (null != ARTICLES.get(language)) {
 			for (String a : ARTICLES.get(language)) {
 				if (result.startsWith(a)) {
diff --git a/src/org/geometerplus/zlibrary/core/util/RationalNumber.java b/src/org/geometerplus/zlibrary/core/util/RationalNumber.java
index fe2283a02..e53e34021 100644
--- a/src/org/geometerplus/zlibrary/core/util/RationalNumber.java
+++ b/src/org/geometerplus/zlibrary/core/util/RationalNumber.java
@@ -29,7 +29,7 @@ public class RationalNumber {
 
 	public final long Numerator;
 	public final long Denominator;
-	
+
 	private RationalNumber(long numerator, long denominator) {
 		final long gcd = GCD(numerator, denominator);
 		if (gcd > 1) {
@@ -43,11 +43,11 @@ public class RationalNumber {
 		Numerator = numerator;
 		Denominator = denominator;
 	}
-	
+
 	public float toFloat() {
 		return 1.0f * Numerator / Denominator;
 	}
-	
+
 	private long GCD(long a, long b) {
 		if (a < 0) {
 			a = -a;
@@ -64,7 +64,7 @@ public class RationalNumber {
 		}
 		return a + b;
 	}
-	
+
 	@Override
 	public boolean equals(Object other) {
 		if (this == other) {
@@ -76,7 +76,7 @@ public class RationalNumber {
 		final RationalNumber otherNumber = (RationalNumber)other;
 		return otherNumber.Numerator == Numerator && otherNumber.Denominator == Denominator;
 	}
-	
+
 	@Override
 	public int hashCode() {
 		return (int)(37 * Numerator + Denominator);
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
index cc6715b8b..bde66338e 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
@@ -924,8 +924,8 @@ public abstract class ZLTextView extends ZLTextViewBase {
 					context.drawLine(xStart, yEnd, xEnd, yEnd);
 					context.drawLine(xEnd, yEnd, xEnd, yStart);
 					context.drawLine(xEnd, yStart, xStart, yStart);
-					final int l = xStart + (xEnd - xStart) * 7 / 16; 
-					final int r = xStart + (xEnd - xStart) * 10 / 16; 
+					final int l = xStart + (xEnd - xStart) * 7 / 16;
+					final int r = xStart + (xEnd - xStart) * 10 / 16;
 					final int t = yStart + (yEnd - yStart) * 2 / 6;
 					final int b = yStart + (yEnd - yStart) * 4 / 6;
 					final int c = yStart + (yEnd - yStart) / 2;
@@ -1537,7 +1537,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
 	private static class ParagraphSize {
 		public int Height;
 		public int TopMargin;
-		public int BottomMargin;	
+		public int BottomMargin;
 	}
 
 	private ParagraphSize paragraphSize(ZLTextPage page, ZLTextWordCursor cursor, boolean beforeCurrentPosition, int unit) {