diff --git a/InternalPythonModules/android/ResultSetIterator.py b/InternalPythonModules/android/ResultSetIterator.py
new file mode 100644
index 0000000000..4abd4438df
--- /dev/null
+++ b/InternalPythonModules/android/ResultSetIterator.py
@@ -0,0 +1,35 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 Basis Technology Corp.
+Contact: carrier <at> sleuthkit <dot> org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class ResultSetIterator(object):
+    """
+        Generic base class for iterating through database recordms
+    """
+
+    def __init__(self, result_set):
+        self.result_set = result_set
+
+    def next(self):
+        if self.result_set is None:
+            return False
+        return self.result_set.next()
+
+    def close(self):
+        if self.result_set is not None:
+            self.result_set.close()
diff --git a/InternalPythonModules/android/TskCallLogsParser.py b/InternalPythonModules/android/TskCallLogsParser.py
new file mode 100644
index 0000000000..22b509d612
--- /dev/null
+++ b/InternalPythonModules/android/TskCallLogsParser.py
@@ -0,0 +1,58 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 Basis Technology Corp.
+Contact: carrier <at> sleuthkit <dot> org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskCallLogsParser(ResultSetIterator):
+    """
+        Generic TSK_CALLLOG artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CALLLOG
+        format.
+
+        A simple example of data transformation would be computing 
+        the end time of a call when the database only supplies the start
+        time and duration.
+    """
+
+    def __init__(self, result_set):
+        super(TskCallLogsParser, self).__init__(result_set)
+        self.INCOMING_MSG_STRING = "Incoming"
+        self.OUTGOING_MSG_STRING = "Outgoing"
+        self._DEFAULT_STRING = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_direction(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_STRING 
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_STRING 
+
+    def get_call_start_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_call_end_date_time(self):
+        return self._DEFAULT_LONG 
+
+    def get_contact_name(self):
+        return self._DEFAULT_STRING
diff --git a/InternalPythonModules/android/TskContactsParser.py b/InternalPythonModules/android/TskContactsParser.py
new file mode 100644
index 0000000000..122e6a9445
--- /dev/null
+++ b/InternalPythonModules/android/TskContactsParser.py
@@ -0,0 +1,49 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 Basis Technology Corp.
+Contact: carrier <at> sleuthkit <dot> org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskContactsParser(ResultSetIterator):
+    """
+        Generic TSK_CONTACT artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_CONTACT
+        format.
+    """
+
+    def __init__(self, result_set):
+        super(TskContactsParser, self).__init__(result_set)
+        self._DEFAULT_VALUE = ""
+
+    def get_account_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_contact_name(self):
+        return self._DEFAULT_VALUE
+
+    def get_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_home_phone(self):
+        return self._DEFAULT_VALUE
+
+    def get_mobile_phone(self):
+        return self._DEFAULT_VALUE
+    
+    def get_email(self):
+        return self._DEFAULT_VALUE
diff --git a/InternalPythonModules/android/TskMessagesParser.py b/InternalPythonModules/android/TskMessagesParser.py
new file mode 100644
index 0000000000..0346a203e7
--- /dev/null
+++ b/InternalPythonModules/android/TskMessagesParser.py
@@ -0,0 +1,68 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 Basis Technology Corp.
+Contact: carrier <at> sleuthkit <dot> org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+from ResultSetIterator import ResultSetIterator
+
+class TskMessagesParser(ResultSetIterator):
+    """
+        Generic TSK_MESSAGE artifact template. Each of these methods
+        will contain the extraction and transformation logic for 
+        converting raw database records to the expected TSK_MESSAGE
+        format.
+
+        An easy example of such a transformation would be converting
+        message date time from milliseconds to seconds. 
+    """
+
+    def __init__(self, result_set):
+        super(TskMessagesParser, self).__init__(result_set)
+        self.INCOMING_MSG_STRING = "Incoming"
+        self.OUTGOING_MSG_STRING = "Outgoing"
+        self._DEFAULT_TEXT = ""
+        self._DEFAULT_LONG = -1L
+        self._DEFAULT_INT = -1
+
+    def get_account_id(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_type(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_direction(self):  
+        return self._DEFAULT_TEXT
+
+    def get_phone_number_from(self):
+        return self._DEFAULT_TEXT
+
+    def get_phone_number_to(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_date_time(self):
+        return self._DEFAULT_LONG
+
+    def get_message_read_status(self):
+        return self._DEFAULT_INT
+
+    def get_message_subject(self):
+        return self._DEFAULT_TEXT
+
+    def get_message_text(self):
+        return self._DEFAULT_TEXT
+
+    def get_thread_id(self):
+        return self._DEFAULT_TEXT
diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py
new file mode 100644
index 0000000000..3a65382c3c
--- /dev/null
+++ b/InternalPythonModules/android/viber.py
@@ -0,0 +1,274 @@
+"""
+Autopsy Forensic Browser
+
+Copyright 2019 Basis Technology Corp.
+Contact: carrier <at> sleuthkit <dot> org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+from java.io import File
+from java.lang import Class
+from java.lang import ClassNotFoundException
+from java.lang import Long
+from java.lang import String
+from java.sql import ResultSet
+from java.sql import SQLException
+from java.sql import Statement
+from java.util.logging import Level
+from org.apache.commons.codec.binary import Base64
+from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.coreutils import Logger
+from org.sleuthkit.autopsy.coreutils import AppSQLiteDB as SQLiteUtil
+from org.sleuthkit.autopsy.coreutils import AppDBParserHelper as BlackboardUtil
+from org.sleuthkit.autopsy.ingest import IngestJobContext
+from org.sleuthkit.datamodel import AbstractFile
+from org.sleuthkit.datamodel import BlackboardArtifact
+from org.sleuthkit.datamodel import BlackboardAttribute
+from org.sleuthkit.datamodel import Content
+from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel import Account
+from TskMessagesParser import TskMessagesParser
+from TskContactsParser import TskContactsParser
+from TskCallLogsParser import TskCallLogsParser
+
+import traceback
+import general
+
+class ViberAnalyzer(general.AndroidComponentAnalyzer):
+    """
+        Parses the Viber App databases for TSK contacts, message and calllog artifacts.
+    """
+   
+    def __init__(self):
+        self._logger = Logger.getLogger(self.__class__.__name__)
+        self._VIBER_PACKAGE_NAME = "com.viber.voip"
+        self._PARSER_NAME = "Viber Parser"
+
+    def analyze(self, dataSource, fileManager, context):
+        """
+            Extract, Transform and Load all messages, contacts and calllogs from the Viber databases.
+        """
+
+        try:
+            contact_and_calllog_dbs = SQLiteUtil.findAppDatabases(dataSource, "viber_data", self._VIBER_PACKAGE_NAME)
+            message_dbs = SQLiteUtil.findAppDatabases(dataSource, "viber_messages", self._VIBER_PACKAGE_NAME)
+
+            #Extract TSK_CONTACT and TSK_CALLLOG information
+            for contact_and_calllog_db in contact_and_calllog_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, contact_and_calllog_db.getDBFile(), Account.Type.VIBER) 
+
+                contacts_parser = ViberContactsParser(contact_and_calllog_db)
+                while contacts_parser.next():
+                    blackboard_util.addContact( 
+                        contacts_parser.get_account_name(), 
+                        contacts_parser.get_contact_name(), 
+                        contacts_parser.get_phone(),
+                        contacts_parser.get_home_phone(),
+                        contacts_parser.get_mobile_phone(),
+                        contacts_parser.get_email()
+                    )
+                contacts_parser.close()
+                calllog_parser = ViberCallLogsParser(contact_and_calllog_db)
+                while calllog_parser.next():
+                    blackboard_util.addCalllog(
+                        calllog_parser.get_account_name(),
+                        calllog_parser.get_call_direction(),
+                        calllog_parser.get_phone_number_from(),
+                        calllog_parser.get_phone_number_to(),
+                        calllog_parser.get_call_start_date_time(),
+                        calllog_parser.get_call_end_date_time(),
+                        calllog_parser.get_contact_name()
+                    )
+                calllog_parser.close()
+
+            #Extract TSK_MESSAGE information
+            for message_db in message_dbs:
+                blackboard_util = BlackboardUtil(self._PARSER_NAME, message_db.getDBFile(), Account.Type.VIBER)
+                messages_parser = ViberMessagesParser(message_db)
+                while messages_parser.next():
+                    blackboard_util.addMessage(
+                        messages_parser.get_account_id(),
+                        messages_parser.get_message_type(),
+                        messages_parser.get_message_direction(),
+                        messages_parser.get_phone_number_from(),
+                        messages_parser.get_phone_number_to(),
+                        messages_parser.get_message_date_time(),
+                        messages_parser.get_message_read_status(),
+                        messages_parser.get_message_subject(),
+                        messages_parser.get_message_text(),
+                        messages_parser.get_thread_id()
+                    )
+                messages_parser.close()
+        except (SQLException, TskCoreException) as ex:
+            #Error parsing Viber db
+            self._logger.log(Level.WARNING, "Error parsing Viber Databases", ex)
+            self._logger.log(Level.WARNING, traceback.format_exec())
+
+class ViberCallLogsParser(TskCallLogsParser):
+    """
+        Extracts TSK_CALLLOG information from the Viber database.
+        TSK_CALLLOG fields that are not in the Viber database are given
+        a default value inherited from the super class.
+    """
+
+    def __init__(self, calllog_db):
+        super(ViberCallLogsParser, self).__init__(calllog_db.runQuery(
+                 """
+                      SELECT C.canonized_number AS number, 
+                             C.type             AS direction, 
+                             C.duration         AS seconds, 
+                             C.date             AS start_time 
+                      FROM   calls AS C 
+                 """
+             )    
+        )
+
+        self._OUTGOING_CALL = 2
+        self._INCOMING_CALL = 1
+        self._MISSED_CALL = 3
+
+    def get_phone_number_from(self):
+        if self.get_call_direction() == self.INCOMING_MSG_STRING:
+            return self.result_set.getString("number")
+        #Give default value if the call is outgoing, the device's # is not stored in the database.
+        return super(ViberCallLogsParser, self).get_phone_number_from()
+
+    def get_phone_number_to(self):
+        if self.get_call_direction() == self.OUTGOING_MSG_STRING:
+            return self.result_set.getString("number")
+        #Give default value if the call is incoming, the device's # is not stored in the database.
+        return super(ViberCallLogsParser, self).get_phone_number_to()
+
+    def get_call_direction(self):
+        direction = self.result_set.getInt("direction")
+        if direction == self._INCOMING_CALL or direction == self._MISSED_CALL:
+            return self.INCOMING_MSG_STRING
+        return self.OUTGOING_MSG_STRING
+
+    def get_call_start_date_time(self):
+        return self.result_set.getLong("start_time") / 1000
+
+    def get_call_end_date_time(self):
+        start_time = self.get_call_start_date_time()
+        duration = self.result_set.getLong("seconds")
+        return start_time + duration
+
+class ViberContactsParser(TskContactsParser):
+    """
+        Extracts TSK_CONTACT information from the Viber database.
+        TSK_CONTACT fields that are not in the Viber database are given a default value
+        inherited from the super class. 
+    """
+
+    def __init__(self, contact_db):
+        super(ViberContactsParser, self).__init__(contact_db.runQuery(
+                 """
+                      SELECT C.display_name AS name, 
+                             D.data2        AS number 
+                      FROM   phonebookcontact AS C 
+                             JOIN phonebookdata AS D 
+                               ON C._id = D.contact_id
+                 """                                                         
+             )
+        )
+    
+    def get_account_name(self):
+        return self.result_set.getString("name")
+        
+    def get_contact_name(self):
+        return self.get_account_name()
+
+    def get_phone(self):
+        return self.result_set.getString("number")
+
+class ViberMessagesParser(TskMessagesParser):
+    """
+        Extract TSK_MESSAGE information from the Viber database.
+        TSK_CONTACT fields that are not in the Viber database are given a default value
+        inherited from the super class. 
+    """
+
+    def __init__(self, message_db):
+        super(ViberMessagesParser, self).__init__(message_db.runQuery(
+                 """
+                      SELECT FROM_RESULT.number     AS from_number,
+                             FROM_RESULT.viber_name AS from_name,
+                             TO_RESULT.number       AS to_number,
+                             M.conversation_id      AS thread_id,
+                             M.body                 AS msg_content,
+                             M.send_type            AS direction,
+                             M.msg_date             AS msg_date,
+                             M.unread               AS read_status
+                      FROM   (SELECT P._id,
+                                     P.conversation_id,
+                                     PI.number,
+                                     PI.viber_name
+                              FROM   participants AS P
+                                     JOIN participants_info AS PI
+                                       ON P.participant_info_id = PI._id) AS FROM_RESULT
+                              JOIN (SELECT P._id,
+                                           P.conversation_id,
+                                           PI.number
+                                    FROM   participants AS P
+                                           JOIN participants_info AS PI
+                                             ON P.participant_info_id = PI._id) AS TO_RESULT
+                                ON FROM_RESULT._id != TO_RESULT._id
+                                   AND FROM_RESULT.conversation_id = TO_RESULT.conversation_id
+                              JOIN messages AS M
+                                ON M.participant_id = FROM_RESULT._id
+                                   AND M.conversation_id = FROM_RESULT.conversation_id  
+                 """
+             )
+        )
+        self._VIBER_MESSAGE_TYPE = "Viber Message"
+        self._INCOMING_MESSAGE_TYPE = 0
+        self._OUTGOING_MESSAGE_TYPE = 1
+
+    def get_account_id(self):
+        name = self.result_set.getString("from_name")
+        if name is None or len(name) == 0:
+            return self.get_phone_number_from()
+        return name
+
+    def get_message_type(self):
+        return self._VIBER_MESSAGE_TYPE 
+
+    def get_phone_number_from(self):
+        return self.result_set.getString("from_number")
+
+    def get_message_direction(self):  
+        direction = self.result_set.getInt("direction")
+        if direction == self._INCOMING_MESSAGE_TYPE:
+            return self.INCOMING_MSG_STRING 
+        return self.OUTGOING_MSG_STRING 
+    
+    def get_phone_number_to(self):
+        return self.result_set.getString("to_number")
+
+    def get_message_date_time(self):
+        #transform from ms to seconds
+        return self.result_set.getLong("msg_date") / 1000 
+
+    def get_message_read_status(self):
+        #Viber: 0 is read, 1 is unread. 
+        #TSK_MESSAGE 1 is read, 0 is unread.
+        if self.get_message_direction() == self.INCOMING_MSG_STRING: 
+            return 1 - self.result_set.getInt("read_status")
+        return super(ViberMessagesParser, self).get_message_read_status()
+
+    def get_message_text(self):
+        return self.result_set.getString("msg_content") 
+
+    def get_thread_id(self):
+        return str(self.result_set.getInt("thread_id"))