diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index a0238e74..a4d478fc 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -262,7 +262,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 		}
 
-		holder.issueCommentDate.setText(TimeHelper.formatTime(currentItem.getCreated_date(), new Locale(locale), timeFormat, mCtx));
+		holder.issueCommentDate.setText(TimeHelper.formatTime(currentItem.getCreated_at(), new Locale(locale), timeFormat, mCtx));
 
 		if(timeFormat.equals("pretty")) {
 			holder.issueCommentDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
diff --git a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
index 90eceb27..84d202dd 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java
@@ -16,77 +16,82 @@ import java.util.Locale;
 
 public class TimeHelper {
 
-    public static String customDateFormatForToast(String customDate) {
+	public static String customDateFormatForToast(String customDate) {
 
-        String[] parts = customDate.split("\\+");
-        String part1 = parts[0] + "Z";
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
-        Date createdTime = null;
-        try {
-            createdTime = formatter.parse(part1);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+		String[] parts = customDate.split("\\+");
+		String part1 = parts[0] + "Z";
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
+		Date createdTime = null;
+		try {
+			createdTime = formatter.parse(part1);
+		}
+		catch(ParseException e) {
+			e.printStackTrace();
+		}
 
-        DateFormat format = DateFormat.getDateTimeInstance();
-        return format.format(createdTime);
+		DateFormat format = DateFormat.getDateTimeInstance();
+		return format.format(createdTime);
 
-    }
+	}
 
-    public static String formatTime(Date date, Locale locale, String timeFormat, Context context) {
+	public static String formatTime(Date date, Locale locale, String timeFormat, Context context) {
 
-        switch (timeFormat) {
+		if(date == null) {
+			return "";
+		}
 
-            case "pretty": {
-                PrettyTime prettyTime = new PrettyTime(Locale.getDefault());
-                return prettyTime.format(date);
-            }
+		switch(timeFormat) {
 
-            case "normal": {
-                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-                return formatter.format(date);
-            }
+			case "pretty": {
+				PrettyTime prettyTime = new PrettyTime(Locale.getDefault());
+				return prettyTime.format(date);
+			}
 
-            case "normal1": {
-                DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-                return formatter.format(date);
-            }
+			case "normal": {
+				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				return formatter.format(date);
+			}
 
-        }
+			case "normal1": {
+				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				return formatter.format(date);
+			}
 
-        return "";
-    }
+		}
 
-    public static String customDateFormatForToastDateFormat(Date customDate) {
+		return "";
+	}
 
-        DateFormat format = DateFormat.getDateTimeInstance();
-        return format.format(customDate);
+	public static String customDateFormatForToastDateFormat(Date customDate) {
 
-    }
+		DateFormat format = DateFormat.getDateTimeInstance();
+		return format.format(customDate);
 
-    public static boolean timeBetweenHours(int fromHour, int toHour) {
+	}
 
-        Calendar cal = Calendar.getInstance();
+	public static boolean timeBetweenHours(int fromHour, int toHour) {
 
-        Calendar from = Calendar.getInstance();
-        from.set(Calendar.HOUR_OF_DAY, fromHour);
-        from.set(Calendar.MINUTE, 0);
+		Calendar cal = Calendar.getInstance();
 
-        Calendar to = Calendar.getInstance();
-        to.set(Calendar.HOUR_OF_DAY, toHour);
-        to.set(Calendar.MINUTE, 0);
+		Calendar from = Calendar.getInstance();
+		from.set(Calendar.HOUR_OF_DAY, fromHour);
+		from.set(Calendar.MINUTE, 0);
 
-        if(to.before(from)) {
-            if (cal.after(to)) {
-                to.add(Calendar.DATE, 1);
-            }
-            else {
-                from.add(Calendar.DATE, -1);
-            }
-        }
+		Calendar to = Calendar.getInstance();
+		to.set(Calendar.HOUR_OF_DAY, toHour);
+		to.set(Calendar.MINUTE, 0);
 
-        return cal.after(from) && cal.before(to);
+		if(to.before(from)) {
+			if(cal.after(to)) {
+				to.add(Calendar.DATE, 1);
+			}
+			else {
+				from.add(Calendar.DATE, -1);
+			}
+		}
 
-    }
+		return cal.after(from) && cal.before(to);
+
+	}
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/models/IssueComments.java b/app/src/main/java/org/mian/gitnex/models/IssueComments.java
index 213d46a6..ba0d0c4c 100644
--- a/app/src/main/java/org/mian/gitnex/models/IssueComments.java
+++ b/app/src/main/java/org/mian/gitnex/models/IssueComments.java
@@ -8,94 +8,106 @@ import java.util.Date;
 
 public class IssueComments {
 
-    private int id;
-    private String html_url;
-    private String pull_request_url;
-    private String issue_url;
-    private String body;
-    private Date created_at;
-    private Date created_date;
-    private Date updated_at;
+	private int id;
+	private String html_url;
+	private String pull_request_url;
+	private String issue_url;
+	private String body;
+	private Date created_at;
+	private Date updated_at;
 
-    private userObject user;
+	private userObject user;
 
-    public IssueComments(String body) {
-        this.body = body;
-    }
+	public IssueComments(String body) {
 
-    public class userObject {
+		this.body = body;
+	}
 
-        private int id;
-        private String login;
-        private String full_name;
-        private String email;
-        private String avatar_url;
-        private String language;
-        private String username;
+	public class userObject {
 
-        public int getId() {
-            return id;
-        }
+		private int id;
+		private String login;
+		private String full_name;
+		private String email;
+		private String avatar_url;
+		private String language;
+		private String username;
 
-        public String getLogin() {
-            return login;
-        }
+		public int getId() {
 
-        public String getFull_name() {
-            return full_name;
-        }
+			return id;
+		}
 
-        public String getEmail() {
-            return email;
-        }
+		public String getLogin() {
 
-        public String getAvatar_url() {
-            return avatar_url;
-        }
+			return login;
+		}
 
-        public String getLanguage() {
-            return language;
-        }
+		public String getFull_name() {
 
-        public String getUsername() {
-            return username;
-        }
+			return full_name;
+		}
 
-    }
+		public String getEmail() {
 
-    public int getId() {
-        return id;
-    }
+			return email;
+		}
 
-    public String getHtml_url() {
-        return html_url;
-    }
+		public String getAvatar_url() {
 
-    public String getPull_request_url() {
-        return pull_request_url;
-    }
+			return avatar_url;
+		}
 
-    public String getIssue_url() {
-        return issue_url;
-    }
+		public String getLanguage() {
 
-    public String getBody() {
-        return body;
-    }
+			return language;
+		}
 
-    public Date getCreated_at() {
-        return created_at;
-    }
+		public String getUsername() {
 
-    public Date getCreated_date() {
-        return created_date;
-    }
+			return username;
+		}
 
-    public userObject getUser() {
-        return user;
-    }
+	}
+
+	public int getId() {
+
+		return id;
+	}
+
+	public String getHtml_url() {
+
+		return html_url;
+	}
+
+	public String getPull_request_url() {
+
+		return pull_request_url;
+	}
+
+	public String getIssue_url() {
+
+		return issue_url;
+	}
+
+	public String getBody() {
+
+		return body;
+	}
+
+	public Date getCreated_at() {
+
+		return created_at;
+	}
+
+	public userObject getUser() {
+
+		return user;
+	}
+
+	public Date getUpdated_at() {
+
+		return updated_at;
+	}
 
-    public Date getUpdated_at() {
-        return updated_at;
-    }
 }