<?xml version="1.0" encoding="us-ascii"?><InstanceReport xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><Version>2.4.0.8</Version><ReportLongName>000970 - Disclosure - Deferred Revenue, current and non-current</ReportLongName><DisplayLabelColumn>true</DisplayLabelColumn><ShowElementNames>false</ShowElementNames><RoundingOption /><HasEmbeddedReports>false</HasEmbeddedReports><Columns><Column FlagID="0"><Id>1</Id><IsAbstractGroupTitle>false</IsAbstractGroupTitle><LabelSeparator>

</LabelSeparator><CurrencyCode /><FootnoteIndexer /><hasSegments>false</hasSegments><hasScenarios>false</hasScenarios><MCU><KeyName /><CurrencySymbol /><contextRef><ContextID>FROM_Jan01_2013_TO_Jun30_2013</ContextID><EntitySchema>http://www.sec.gov/CIK</EntitySchema><EntityValue>0001481241</EntityValue><PeriodDisplayName /><PeriodType>duration</PeriodType><PeriodStartDate>2013-01-01T00:00:00</PeriodStartDate><PeriodEndDate>2013-06-30T00:00:00</PeriodEndDate><Segments /><Scenarios /></contextRef><UPS /><CurrencyCode /><OriginalCurrencyCode /></MCU><CurrencySymbol /><Labels><Label Key="CalendarSupplement" Id="0" Label="6 Months Ended" /><Label Key="Calendar" Id="1" Label="Jun. 30, 2013" /></Labels></Column></Columns><Rows><Row FlagID="0"><Id>1</Id><IsAbstractGroupTitle>true</IsAbstractGroupTitle><LabelSeparator>

</LabelSeparator><Level>1</Level><ElementName>us-gaap_DeferredRevenueAbstract</ElementName><ElementPrefix>us-gaap_</ElementPrefix><IsBaseElement>true</IsBaseElement><BalanceType>na</BalanceType><PeriodType>duration</PeriodType><IsReportTitle>false</IsReportTitle><IsSegmentTitle>false</IsSegmentTitle><IsCalendarTitle>false</IsCalendarTitle><IsEquityPrevioslyReportedAsRow>false</IsEquityPrevioslyReportedAsRow><IsEquityAdjustmentRow>false</IsEquityAdjustmentRow><IsBeginningBalance>false</IsBeginningBalance><IsEndingBalance>false</IsEndingBalance><IsReverseSign>false</IsReverseSign><FootnoteIndexer /><Cells><Cell FlagID="0" ContextID="" UnitID=""><Id>1</Id><IsNumeric>false</IsNumeric><IsRatio>false</IsRatio><DisplayZeroAsNone>false</DisplayZeroAsNone><NumericAmount>0</NumericAmount><RoundedNumericAmount>0</RoundedNumericAmount><NonNumbericText /><FootnoteIndexer /><CurrencyCode /><CurrencySymbol /><IsIndependantCurrency>false</IsIndependantCurrency><ShowCurrencySymbol>false</ShowCurrencySymbol><DisplayDateInUSFormat>false</DisplayDateInUSFormat></Cell></Cells><ElementDataType>xbrli:stringItemType</ElementDataType><SimpleDataType>string</SimpleDataType><IsTotalLabel>false</IsTotalLabel><UnitID>0</UnitID><Label>Deferred Revenue [Abstract]</Label></Row><Row FlagID="0"><Id>2</Id><IsAbstractGroupTitle>false</IsAbstractGroupTitle><LabelSeparator>

</LabelSeparator><Level>2</Level><ElementName>us-gaap_DeferredRevenueDisclosureTextBlock</ElementName><ElementPrefix>us-gaap_</ElementPrefix><IsBaseElement>true</IsBaseElement><BalanceType>na</BalanceType><PeriodType>duration</PeriodType><IsReportTitle>false</IsReportTitle><IsSegmentTitle>false</IsSegmentTitle><IsCalendarTitle>false</IsCalendarTitle><IsEquityPrevioslyReportedAsRow>false</IsEquityPrevioslyReportedAsRow><IsEquityAdjustmentRow>false</IsEquityAdjustmentRow><IsBeginningBalance>false</IsBeginningBalance><IsEndingBalance>false</IsEndingBalance><IsReverseSign>false</IsReverseSign><FootnoteIndexer /><Cells><Cell FlagID="0" ContextID="FROM_Jan01_2013_TO_Jun30_2013" UnitID=""><Id>1</Id><IsNumeric>false</IsNumeric><IsRatio>false</IsRatio><DisplayZeroAsNone>false</DisplayZeroAsNone><NumericAmount>0</NumericAmount><RoundedNumericAmount>0</RoundedNumericAmount><NonNumbericText>&lt;p style='margin-top:0pt; margin-bottom:0pt'&gt;&lt;font style="font-family:Calibri;font-size:11pt;font-weight:bold;margin-left:0px;"&gt;6&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;font-weight:bold;"&gt;.&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;font-weight:bold;"&gt;&amp;#160;&amp;#160;&amp;#160;&amp;#160;&amp;#160;&amp;#160;&amp;#160;Deferred revenue, current and non-current&lt;/font&gt;&lt;/p&gt;&lt;p style='margin-top:0pt; margin-bottom:0pt'&gt;&amp;#160;&lt;/p&gt;&lt;p style='margin-top:0pt; margin-bottom:0pt'&gt;&lt;font style="font-family:Calibri;font-size:11pt;margin-left:0px;"&gt;The amounts presented as current and non-current deferred revenue in the accompanying consolidated balance sheets as of June 30, 2013 and &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;December 31, &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;2012 reflect (a) cash received prior to the balance sheet date for which all criteria to recognize as revenue have not been met, (b) deferred revenue resulting from free quantities of lubricants provided to the vessels as a benefit from the suppliers for entering into&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; long term contracts with them. &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;Deferred revenue under (b) above&lt;/font&gt;&lt;font style="font-family:Times New Roman;font-size:11pt;"&gt; &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;is amortized to Operating expenses &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;according to the terms &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;of the respective contracts.&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;For &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;the &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;six months ended June 30&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;, &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;2013&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; and&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; 2012&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;,&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; &lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt;amortization&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; of the deferred revenue from free lubricants&lt;/font&gt;&lt;font style="font-family:Calibri;font-size:11pt;"&gt; amounted to $50 and $46 respectively.&lt;/font&gt;&lt;/p&gt;&lt;p style='margin-top: 0pt; margin-bottom: 0pt;'&gt;&lt;/p&gt;&lt;div&gt;&lt;table style="border-collapse:collapse;margin-top:20px;"&gt;&lt;tr style="height: 20px"&gt;&lt;td   style="width: 25px; text-align:left;border-color:#000000;min-width:25px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 206px; text-align:left;border-color:#000000;min-width:206px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 14px; text-align:left;border-color:#000000;min-width:14px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 136px; border-bottom-style:solid;border-bottom-width:1px;text-align:center;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-WEIGHT: bold;FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;June 30, 2013&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:left;border-color:#000000;min-width:14px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 123px; border-bottom-style:solid;border-bottom-width:1px;text-align:center;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-WEIGHT: bold;FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;December 31, 2012&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr style="height: 20px"&gt;&lt;td colspan="2"  style="width: 231px; text-align:left;border-color:#000000;min-width:231px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;"&gt;Hires collected in advance &lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 136px; border-top-style:solid;border-top-width:1px;text-align:right;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 1,227&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 123px; border-top-style:solid;border-top-width:1px;text-align:right;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 1,157&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr style="height: 20px"&gt;&lt;td colspan="2"  style="width: 231px; text-align:left;border-color:#000000;min-width:231px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;"&gt;Deferred revenue from lubricants&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 136px; border-bottom-style:solid;border-bottom-width:1px;text-align:right;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 328&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 123px; border-bottom-style:solid;border-bottom-width:1px;text-align:right;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 378&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr style="height: 20px"&gt;&lt;td   style="width: 25px; text-align:left;border-color:#000000;min-width:25px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 206px; text-align:left;border-color:#000000;min-width:206px;"&gt;&lt;font style="FONT-WEIGHT: bold;FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;"&gt;Total &lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 136px; border-top-style:solid;border-top-width:1px;border-bottom-style:solid;border-bottom-width:2px;text-align:right;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 1,555&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 123px; border-top-style:solid;border-top-width:1px;border-bottom-style:solid;border-bottom-width:2px;text-align:right;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 1,535&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr style="height: 20px"&gt;&lt;td colspan="2"  style="width: 231px; text-align:left;border-color:#000000;min-width:231px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;"&gt;Less current portion &lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 136px; border-top-style:solid;border-top-width:2px;border-bottom-style:solid;border-bottom-width:1px;text-align:right;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; (1,334)&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 123px; border-top-style:solid;border-top-width:2px;border-bottom-style:solid;border-bottom-width:1px;text-align:right;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; (1,264)&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr style="height: 20px"&gt;&lt;td   style="width: 25px; text-align:left;border-color:#000000;min-width:25px;"&gt;&amp;#160;&lt;/td&gt;&lt;td   style="width: 206px; text-align:left;border-color:#000000;min-width:206px;"&gt;&lt;font style="FONT-WEIGHT: bold;FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;"&gt;Non-current portion &lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 136px; border-top-style:solid;border-top-width:1px;border-bottom-style:double;border-bottom-width:3px;text-align:right;border-color:#000000;min-width:136px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 221&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 14px; text-align:center;border-color:#000000;min-width:14px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: center;"&gt;$&lt;/font&gt;&lt;/td&gt;&lt;td   style="width: 123px; border-top-style:solid;border-top-width:1px;border-bottom-style:double;border-bottom-width:3px;text-align:right;border-color:#000000;min-width:123px;"&gt;&lt;font style="FONT-FAMILY: Calibri;FONT-SIZE: 10pt;COLOR: #000000;TEXT-ALIGN: right;"&gt; 271&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/div&gt;</NonNumbericText><FootnoteIndexer /><CurrencyCode /><CurrencySymbol /><IsIndependantCurrency>false</IsIndependantCurrency><ShowCurrencySymbol>false</ShowCurrencySymbol><DisplayDateInUSFormat>false</DisplayDateInUSFormat></Cell></Cells><ElementDataType>nonnum:textBlockItemType</ElementDataType><SimpleDataType>na</SimpleDataType><ElementDefenition>The entire disclosure for deferred revenues at the end of the reporting period, and description and amounts of significant changes that occurred during the reporting period. Deferred revenue is a liability as of the balance sheet date related to a revenue producing activity for which revenue has not yet been recognized. Generally, an entity records deferred revenue when it receives consideration from a customer before achieving certain criteria that must be met for revenue to be recognized in conformity with GAAP.</ElementDefenition><ElementReferences>Reference 1: http://www.xbrl.org/2003/role/presentationRef

 -Publisher FASB

 -Name Accounting Standards Codification

 -Topic 210

 -SubTopic 10

 -Section 45

 -Paragraph 8

 -Subparagraph (b)

 -URI http://asc.fasb.org/extlink&amp;oid=6361293&amp;loc=d3e6935-107765



Reference 2: http://www.xbrl.org/2003/role/presentationRef

 -Publisher SEC

 -Name Staff Accounting Bulletin (SAB)

 -Number Topic 13

 -Section A



Reference 3: http://www.xbrl.org/2003/role/presentationRef

 -Publisher FASB

 -Name Accounting Standards Codification

 -Topic 605

 -SubTopic 10

 -Section S99

 -Paragraph 1

 -Subparagraph (SAB TOPIC 13.A.3(b).Q1(c),(b).Q2,(c).Q3)

 -URI http://asc.fasb.org/extlink&amp;oid=6600647&amp;loc=d3e214044-122780



Reference 4: http://www.xbrl.org/2003/role/presentationRef

 -Publisher FASB

 -Name Statement of Financial Accounting Concepts (CON)

 -Number 5

 -Paragraph 83, 84

 -LegacyDoc This reference is SUPERSEDED by the Accounting Standards Codification effective for interim and annual periods ending after September 15, 2009.  This reference is included to help users transition from the previous accounting hierarchy and will be removed from future versions of this taxonomy.



</ElementReferences><IsTotalLabel>false</IsTotalLabel><UnitID>0</UnitID><Label>Deferred Revenue, current and non-current</Label></Row></Rows><Footnotes /><IsEquityReport>false</IsEquityReport><ReportName>Deferred Revenue, current and non-current</ReportName><MonetaryRoundingLevel>UnKnown</MonetaryRoundingLevel><SharesRoundingLevel>UnKnown</SharesRoundingLevel><PerShareRoundingLevel>UnKnown</PerShareRoundingLevel><ExchangeRateRoundingLevel>UnKnown</ExchangeRateRoundingLevel><HasCustomUnits>true</HasCustomUnits><IsEmbedReport>false</IsEmbedReport><IsMultiCurrency>false</IsMultiCurrency><ReportType>Sheet</ReportType><RoleURI>http://www.dcontainerships.com/role/DisclosureDeferredRevenueCurrentAndNoncurrent</RoleURI><NumberOfCols>1</NumberOfCols><NumberOfRows>2</NumberOfRows></InstanceReport>
